diff options
author | Karl Berry <karl@freefriends.org> | 2016-05-02 01:30:05 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-05-02 01:30:05 +0000 |
commit | 966c8c981c3264bf82e6c256dc35c7d2d27f49ba (patch) | |
tree | 303845f3b25af7fe42b44c815726a100ad607c51 /Master/texmf-dist/tex/latex | |
parent | f385fb50ed694e9ae7173d5f82f78994a0a610b0 (diff) |
microtype (30apr16)
git-svn-id: svn://tug.org/texlive/trunk@40825 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
26 files changed, 507 insertions, 308 deletions
diff --git a/Master/texmf-dist/tex/latex/microtype/letterspace.sty b/Master/texmf-dist/tex/latex/microtype/letterspace.sty index 3afa0048c1e..f25a97bc47b 100644 --- a/Master/texmf-dist/tex/latex/microtype/letterspace.sty +++ b/Master/texmf-dist/tex/latex/microtype/letterspace.sty @@ -10,7 +10,7 @@ %% %% The `microtype' package %% Subliminal refinements towards typographical perfection -%% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2016 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 @@ -21,8 +21,8 @@ %% 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. +%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, +%% microtype-xetex.def, microtype.lua and letterspace.sty. %% %% ------------------------------------------------------------------------ %% This is a stand-alone version that only provides the letterspacing @@ -33,9 +33,9 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage {letterspace} - [2013/05/23 v2.5a + [2016/05/01 v2.6 Robust letterspacing - (RS)] + (RS)] \def\MT@MT {letterspace} \let\MT@restore@catcodes\@empty @@ -114,11 +114,18 @@ \def\MT@engine{pdf} \let\MT@pdf@or@lua\@firstoftwo \ifnum\pdftexversion > 139 \def\MT@engine@tooold{1}\fi - \ifx\directlua\@undefined \else - \ifx\directlua\relax \else - \def\MT@engine{lua} - \let\MT@pdf@or@lua\@secondoftwo - \ifnum\luatexversion < 62 \def\MT@engine@tooold{0}\fi + \fi +\fi +\ifx\directlua\@undefined \else + \ifx\directlua\relax \else + \def\MT@engine{lua} + \let\MT@pdf@or@lua\@secondoftwo + \ifnum\luatexversion < 62 \def\MT@engine@tooold{0} + \else + \def\MT@engine@tooold{1} + \ifnum\luatexversion > 84 + \let\pdfoutput\outputmode + \let\pdfprotrudechars\protrudechars \fi \fi \fi @@ -214,14 +221,28 @@ \advance\@tempcnta \@ne \ifnum\@tempcnta < #2\MT@repeat } -\def\MT@do@font{\MT@while@num\z@ - \@cclvi +\def\MT@do@font#1{% + \MT@if@fontspec@font{% + \def\MT@dofont@function{#1}% + \MT@lua{microtype.do_font()}% + }{\MT@while@num\z@\@cclvi{#1}}% } \MT@requires@latex1{ \let\MT@setup@\@empty \def\MT@addto@setup{\g@addto@macro\MT@setup@} }{\let\MT@addto@setup\@firstofone} \def\MT@with@package@T#1{\@ifpackageloaded{#1}\@firstofone\@gobble} +\newif\ifMT@fontspec +\MT@requires@latex2{ +\MT@with@package@T{fontspec}\MT@fontspectrue +}{\MT@fontspecfalse} +\let\MT@if@fontspec@font\@secondoftwo +\def\MT@fontspec@setup{% + \@ifpackagelater{fontspec}{2013/05/23}{ + \MT@let@cn\MT@if@fontspec@font{fontspec_if_fontspec_font:TF}% + }\relax +} +\ifMT@fontspec\MT@fontspec@setup\fi \MT@addto@setup{% \MT@requires@latex2{ \MT@with@package@T{hyperref}{% @@ -253,14 +274,23 @@ /\number\MT@letterspace@ ls\endcsname}% \expandafter\ifx\MT@lsfont\relax \MT@get@ls@basefont + \MT@if@fontspec@font{% + \global\expandafter\font\MT@lsfont=% + \expandafter\MT@exp@two@c\expandafter\MT@ls@fontspec@font + \expandafter\fontname\expandafter\MT@font\space \@nil + }{% \global\expandafter\letterspacefont\MT@lsfont\font@name\MT@letterspace@ + }% % spacing = {<letterspace amount>*,,} \fontdimen2\MT@lsfont=\dimexpr\numexpr 1000+\MT@letterspace@\relax sp * \fontdimen2\MT@lsfont/1000\relax % no ligatures = {f} \tagcode\MT@lsfont`f=\m@ne + \MT@if@fontspec@font\relax{% \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 \xdef\MT@set@curr@ls{\def\noexpand\MT@curr@ls{\MT@letterspace@}}% @@ -285,11 +315,26 @@ {MT@aftergroup@\number\currentgrouplevel}% }% } +\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;" + \ifx\\#2\\ at \f@size pt\else#2\fi\relax +} \MT@requires@latex2{ \def\MT@set@lsfont{\MT@exp@two@c\let\font@name\MT@lsfont} \DeclareRobustCommand\lsstyle{% \not@math@alphabet\lsstyle\textls - \let\glb@currsize\@empty + \MT@glet\glb@currsize\@empty \let\MT@tracking\MT@set@tr@codes \selectfont } @@ -383,33 +428,37 @@ } \MT@requires@latex2{ \MT@addto@setup{% + \MT@with@package@T{luatexja}{\MT@warn@unknown@once{luatexja}}% + \MT@with@package@T{xeCJK} {\MT@warn@unknown@once{xeCJK}}% \@ifpackageloaded{CJK}{% - \@ifpackagelater{CJK}{2006/10/17}% 4.7.0 - {\def\MT@orig@pickupfont{\CJK@ifundefined\CJK@plane}}% - {\def\MT@orig@pickupfont{\@ifundefined{CJK@plane}}}% - \g@addto@macro\MT@orig@pickupfont - {{\expandafter\ifx\font@name\relax\define@newfont\fi}}% - \@ifpackageloaded{CJKutf8}% - {\@ifpackagelater{CJKutf8}{2008/05/22}% 4.8.0 - {\ifpdf\expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi}% - {\@firstoftwo}}% - {\@firstoftwo}% - {\g@addto@macro\MT@orig@pickupfont{% - {\expandafter\ifx\csname\curr@fontshape/\f@size/\CJK@plane\endcsname\relax - \define@newfont\else\xdef\font@name{% + \@ifpackageloaded{xeCJK}{\@firstofone}{% + \@ifpackagelater{CJK}{2006/10/17}% 4.7.0 + {\def\MT@orig@pickupfont{\CJK@ifundefined\CJK@plane}}% + {\def\MT@orig@pickupfont{\@ifundefined{CJK@plane}}}% + \g@addto@macro\MT@orig@pickupfont + {{\expandafter\ifx\font@name\relax\define@newfont\fi}}% + \@ifpackageloaded{CJKutf8}% + {\@ifpackagelater{CJKutf8}{2008/05/22}% 4.8.0 + {\ifpdf\expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi}% + {\@firstoftwo}}% + {\@firstoftwo}% + {\g@addto@macro\MT@orig@pickupfont{% + {\expandafter\ifx\csname\curr@fontshape/\f@size/\CJK@plane\endcsname\relax + \define@newfont\else\xdef\font@name{% + \csname \curr@fontshape/\f@size/\CJK@plane\endcsname}\fi}}}% + {\g@addto@macro\MT@orig@pickupfont{% + {\expandafter\ifx\csname \curr@fontshape/\f@size/\CJK@plane\endcsname\relax + \define@newfont\def\CJK@temp{v}% + \ifx\CJK@temp\CJK@plane + \expandafter\ifx\csname CJK@cmap@\f@family\CJK@plane\endcsname\relax + \else\csname CJK@cmap@\f@family\CJK@plane\endcsname\fi + \else \CJK@addcmap\CJK@plane \fi + \else\xdef\font@name{% \csname \curr@fontshape/\f@size/\CJK@plane\endcsname}\fi}}}% - {\g@addto@macro\MT@orig@pickupfont{% - {\expandafter\ifx\csname \curr@fontshape/\f@size/\CJK@plane\endcsname\relax - \define@newfont\def\CJK@temp{v}% - \ifx\CJK@temp\CJK@plane - \expandafter\ifx\csname CJK@cmap@\f@family\CJK@plane\endcsname\relax - \else\csname CJK@cmap@\f@family\CJK@plane\endcsname\fi - \else \CJK@addcmap\CJK@plane \fi - \else\xdef\font@name{% - \csname \curr@fontshape/\f@size/\CJK@plane\endcsname}\fi}}}% - }{% - \def\MT@orig@pickupfont{\expandafter\ifx\font@name\relax\define@newfont\fi}% - }% + \@gobble + }% + }{\@firstofone}% + {\def\MT@orig@pickupfont{\expandafter\ifx\font@name\relax\define@newfont\fi}}% \ifx\pickup@font\MT@orig@pickupfont \else \MT@warning@nl{% Command \string\pickup@font\space is not defined as expected.% diff --git a/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def b/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def index fe2e8000886..d37b39b7763 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--2013 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2016 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 @@ -21,8 +21,8 @@ %% 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. +%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, +%% microtype-xetex.def, microtype.lua and letterspace.sty. %% %% ------------------------------------------------------------------------ %% This file contains enginge-specific definitions. @@ -30,17 +30,20 @@ %% \ProvidesFile {microtype-luatex.def} - [2013/05/23 v2.5a + [2016/05/01 v2.6 Definitions specific to luatex - (RS)] + (RS)] \def\MT@lua{\directlua} -\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{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 \def @@ -49,17 +52,21 @@ \MT@luatex@no <#1 \expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi} \RequirePackage{luatexbase} +\RequirePackage{luaotfload} \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} -\def\MT@do@font{\MT@while@num\z@ - \MT@max@slot +\def\MT@do@font#1{% + \MT@if@fontspec@font{% + \def\MT@dofont@function{#1}% + \MT@lua{microtype.do_font()}% + }{\MT@while@num\z@\@cclvi{#1}}% } \def\MT@ledmac@setup{% \ifMT@protrusion \MT@ifdefined@c@TF\l@dunhbox@line{% - \MT@info@nl{Patching (e)ledmac to enable character protrusion}% + \MT@info@nl{Patching ((r)e)ledmac to enable character protrusion}% \let\MT@led@unhbox@line\l@dunhbox@line \renewcommand*{\l@dunhbox@line}[1]{% \ifhbox##1% @@ -71,7 +78,8 @@ }{% \MT@warning@nl{% Character protrusion in paragraphs with line\MessageBreak - numbering will only work if you update ledmac}% + numbering will only work if you update ledmac,\MessageBreak + or use one of its successors, eledmac or reledmac}% }% \fi } @@ -99,6 +107,7 @@ \fi } \let\MT@copy@font\relax +\MT@requires@luatex4{\let\pdfcopyfont\copyfont}\relax \def\MT@copy@font@{% \xdef\MT@font@copy{\csname\MT@@font/\MT@pr@context/\MT@ex@context\endcsname}% \expandafter\ifx\MT@font@copy\relax @@ -289,6 +298,7 @@ \MT@nonselectedfalse } \let\MT@set@ex@codes\MT@set@ex@codes@n +\MT@requires@luatex4{\let\pdffontexpand\expandglyphsinfont}\relax \def\MT@expandfont{% \pdffontexpand\MT@font \MT@stretch@ \MT@shrink@ \MT@step@ \MT@auto@\relax } @@ -386,7 +396,13 @@ /\number\MT@letterspace@ ls\endcsname}% \expandafter\ifx\MT@lsfont\relax \MT@get@ls@basefont + \MT@if@fontspec@font{% + \global\expandafter\font\MT@lsfont=% + \expandafter\MT@exp@two@c\expandafter\MT@ls@fontspec@font + \expandafter\fontname\expandafter\MT@font\space \@nil + }{% \global\expandafter\letterspacefont\MT@lsfont\font@name\MT@letterspace@ + }% \MT@ifdefined@c@TF\MT@tr@ispace {\let\@tempa\MT@tr@ispace}% {\edef\@tempa{\MT@letterspace@*,,}}% @@ -397,12 +413,15 @@ \MT@ifdefined@c@TF\MT@tr@okern{\let\@tempa\MT@tr@okern}{\def\@tempa{*,*}}% \expandafter\MT@tr@set@okern\@tempa,% \MT@ifdefined@c@T\MT@tr@ligatures\MT@tr@noligatures + \MT@if@fontspec@font\relax{% \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 + \MT@if@fontspec@font\MT@font\relax \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 @@ -422,10 +441,10 @@ \MT@afteraftergroup{% \MT@set@curr@os \MT@set@curr@ok + \MT@glet\noexpand\glb@currsize\noexpand\@empty \noexpand\MT@tr@outer@r }% \fi - \MT@protrusionfalse }% } \def\MT@afteraftergroup#1{% @@ -436,6 +455,21 @@ {MT@aftergroup@\number\currentgrouplevel}% }% } +\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;" + \ifx\\#2\\ at \f@size pt\else#2\fi\relax +} \def\MT@get@tr@opt{% \MT@set@listname \MT@ifdefined@n@T{MT@tr@c@\MT@tr@c@name}{% @@ -465,7 +499,7 @@ \def\MT@set@lsfont{\MT@exp@two@c\let\font@name\MT@lsfont} \DeclareRobustCommand\lsstyle{% \not@math@alphabet\lsstyle\textls - \let\glb@currsize\@empty + \MT@glet\glb@currsize\@empty \def\MT@feat{tr}% \let\MT@tracking\MT@set@tr@codes \selectfont @@ -612,7 +646,7 @@ \MT@if@outer@next\space\relax{% \MT@if@outer@next\@xobeysp\relax{% \MT@if@outer@next\xspace{% - \def\MT@temp*\xspace{\futurelet\@let@token\MT@xspace}% + \def\MT@temp*\xspace{\MT@xspace}% }{% \def\MT@temp*{\ifdim\MT@outer@kern=\z@\else\MT@ls@outer@k \fi}% @@ -626,7 +660,8 @@ \let\@let@token= \MT@tr@outer@next \maybe@ic@ } -\def\MT@xspace{\@xspace@firsttrue\@xspace +\def\MT@xspace{\futurelet\@let@token\MT@xspace@} +\def\MT@xspace@{\@xspace@firsttrue\@xspace \ifdim\lastskip>5sp \unskip \hskip\MT@outer@space \else @@ -690,6 +725,7 @@ \MT@noligatures@\MT@font\MT@nl@ligatures \fi } +\MT@requires@luatex4{\let\pdfnoligatures\ignoreligaturesinfont}\relax \def\MT@noligatures@#1#2{% \MT@ifdefined@c@TF#2{% \MT@ifdefined@c@TF\tagcode{% @@ -697,7 +733,11 @@ \def\MT@curr@list@name{\@backslashchar DisableLigatures}% \MT@map@clist@c#2{% \KV@@sp@def\@tempa{##1}\MT@get@slot - \ifnum\MT@char>\m@ne \tagcode#1\MT@char=\m@ne \fi}% + \ifnum\MT@char>\m@ne + \tagcode#1\MT@char=\m@ne + \MT@if@fontspec@font{\MT@lua{microtype.noligatures([[#1]],[[\MT@char]])}}\relax + \fi + }% \MT@vinfo{... Disabling ligatures for characters: #2}% }{% \pdfnoligatures#1% @@ -707,7 +747,9 @@ }% }{% \pdfnoligatures#1% - \MT@vinfo{... Disabling ligatures}% + \MT@if@fontspec@font + {\MT@lua{microtype.noligatures([[#1]],"_all_")}}\relax + \MT@vinfo{... Disabling all ligatures}% }% } \def\MT@get@slot@{% @@ -902,6 +944,7 @@ \fi \fi } +\MT@requires@luatex4{\let\pdfoutput\outputmode}\relax \MT@def@bool@opt{DVIoutput}{% \csname if\@tempa\endcsname \ifnum\pdfoutput>\z@ \MT@opt@DVItrue \fi @@ -978,6 +1021,10 @@ } \MT@define@optionX{protrusion}\MT@protrudechars \MT@define@optionX{expansion}\MT@adjustspacing +\MT@requires@luatex4{ + \let\pdfprotrudechars\protrudechars + \let\pdfadjustspacing\adjustspacing +}\relax \let\MT@protrudechars\pdfprotrudechars \let\MT@adjustspacing\pdfadjustspacing \MT@requires@luatex3{ @@ -1009,9 +1056,6 @@ } \MT@define@optionX@{tracking}{\ifnum\@tempcnta=\z@ \let\MT@tracking\MT@set@tr@zero \else \let\MT@tracking\MT@tracking@ \fi} - \MT@define@optionX@{spacing}{\pdfadjustinterwordglue\@tempcnta} - \MT@define@optionX@{kerning}{\pdfprependkern\@tempcnta - \pdfappendkern \@tempcnta} }{ \define@key{MTX}{tracking}[true]{\MT@warning{Ignoring tracking setup}} } diff --git a/Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def b/Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def index 2729281d6cb..fbf8c63fb54 100644 --- a/Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def +++ b/Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def @@ -10,7 +10,7 @@ %% %% The `microtype' package %% Subliminal refinements towards typographical perfection -%% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2016 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 @@ -21,8 +21,8 @@ %% 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. +%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, +%% microtype-xetex.def, microtype.lua and letterspace.sty. %% %% ------------------------------------------------------------------------ %% This file contains enginge-specific definitions. @@ -30,10 +30,10 @@ %% \ProvidesFile {microtype-pdftex.def} - [2013/05/23 v2.5a + [2016/05/01 v2.6 Definitions specific to pdftex - (RS)] + (RS)] \def\MT@pdftex@no{7} \ifnum\pdftexversion = 140 \ifnum\pdftexrevision < 4 @@ -135,14 +135,12 @@ \fi } } -\def\MT@do@font{\MT@while@num\z@ - \@cclvi -} +\def\MT@do@font{\MT@while@num\z@\@cclvi} \MT@requires@pdftex5{ \def\MT@ledmac@setup{% \ifMT@protrusion \MT@ifdefined@c@TF\l@dunhbox@line{% - \MT@info@nl{Patching (e)ledmac to enable character protrusion}% + \MT@info@nl{Patching ((r)e)ledmac to enable character protrusion}% \let\MT@led@unhbox@line\l@dunhbox@line \renewcommand*{\l@dunhbox@line}[1]{% \ifhbox##1% @@ -154,7 +152,8 @@ }{% \MT@warning@nl{% Character protrusion in paragraphs with line\MessageBreak - numbering will only work if you update ledmac}% + numbering will only work if you update ledmac,\MessageBreak + or use one of its successors, eledmac or reledmac}% }% \fi } @@ -164,7 +163,7 @@ \MT@warning@nl{% The pdftex version you are using does not allow\MessageBreak character protrusion in paragraphs with line\MessageBreak - numbering by the `ledmac' package.\MessageBreak + numbering by the `((r)e)ledmac' package.\MessageBreak Upgrade pdftex to version 1.30 or later}% \fi } @@ -685,6 +684,7 @@ \MT@afteraftergroup{% \MT@set@curr@os \MT@set@curr@ok + \MT@glet\noexpand\glb@currsize\noexpand\@empty \noexpand\MT@tr@outer@r }% \fi @@ -727,7 +727,7 @@ \def\MT@set@lsfont{\MT@exp@two@c\let\font@name\MT@lsfont} \DeclareRobustCommand\lsstyle{% \not@math@alphabet\lsstyle\textls - \let\glb@currsize\@empty + \MT@glet\glb@currsize\@empty \def\MT@feat{tr}% \let\MT@tracking\MT@set@tr@codes \selectfont @@ -883,7 +883,7 @@ \MT@if@outer@next\space\relax{% \MT@if@outer@next\@xobeysp\relax{% \MT@if@outer@next\xspace{% - \def\MT@temp*\xspace{\futurelet\@let@token\MT@xspace}% + \def\MT@temp*\xspace{\MT@xspace}% }{% \def\MT@temp*{\ifdim\MT@outer@kern=\z@\else\MT@ls@outer@k \fi}% @@ -897,7 +897,8 @@ \let\@let@token= \MT@tr@outer@next \maybe@ic@ } -\def\MT@xspace{\@xspace@firsttrue\@xspace +\def\MT@xspace{\futurelet\@let@token\MT@xspace@} +\def\MT@xspace@{\@xspace@firsttrue\@xspace \ifdim\lastskip>5sp \unskip \hskip\MT@outer@space \else @@ -969,7 +970,10 @@ \def\MT@curr@list@name{\@backslashchar DisableLigatures}% \MT@map@clist@c#2{% \KV@@sp@def\@tempa{##1}\MT@get@slot - \ifnum\MT@char>\m@ne \tagcode#1\MT@char=\m@ne \fi}% + \ifnum\MT@char>\m@ne + \tagcode#1\MT@char=\m@ne + \fi + }% \MT@vinfo{... Disabling ligatures for characters: #2}% }{% \pdfnoligatures#1% @@ -979,7 +983,7 @@ }% }{% \pdfnoligatures#1% - \MT@vinfo{... Disabling ligatures}% + \MT@vinfo{... Disabling all ligatures}% }% } }\relax @@ -1347,9 +1351,6 @@ } \MT@define@optionX@{tracking}{\ifnum\@tempcnta=\z@ \let\MT@tracking\MT@set@tr@zero \else \let\MT@tracking\MT@tracking@ \fi} - \MT@define@optionX@{spacing}{\pdfadjustinterwordglue\@tempcnta} - \MT@define@optionX@{kerning}{\pdfprependkern\@tempcnta - \pdfappendkern \@tempcnta} }{ \define@key{MTX}{tracking}[true]{\MT@warning{Ignoring tracking setup}} \define@key{MTX}{kerning}[true]{\MT@warning{Ignoring kerning setup}} diff --git a/Master/texmf-dist/tex/latex/microtype/microtype-xetex.def b/Master/texmf-dist/tex/latex/microtype/microtype-xetex.def index 86a169114dd..0e570ebb469 100644 --- a/Master/texmf-dist/tex/latex/microtype/microtype-xetex.def +++ b/Master/texmf-dist/tex/latex/microtype/microtype-xetex.def @@ -10,7 +10,7 @@ %% %% The `microtype' package %% Subliminal refinements towards typographical perfection -%% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2016 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 @@ -21,8 +21,8 @@ %% 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. +%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, +%% microtype-xetex.def, microtype.lua and letterspace.sty. %% %% ------------------------------------------------------------------------ %% This file contains enginge-specific definitions. @@ -30,10 +30,10 @@ %% \ProvidesFile {microtype-xetex.def} - [2013/05/23 v2.5a + [2016/05/01 v2.6 Definitions specific to xetex - (RS)] + (RS)] \ifdim 0\XeTeXrevision pt < 0.9997pt \def\MT@xetex@no{1} \else @@ -85,7 +85,7 @@ \def\MT@ledmac@setup{% \ifMT@protrusion \MT@ifdefined@c@TF\l@dunhbox@line{% - \MT@info@nl{Patching (e)ledmac to enable character protrusion}% + \MT@info@nl{Patching ((r)e)ledmac to enable character protrusion}% \let\MT@led@unhbox@line\l@dunhbox@line \renewcommand*{\l@dunhbox@line}[1]{% \ifhbox##1% @@ -97,7 +97,8 @@ }{% \MT@warning@nl{% Character protrusion in paragraphs with line\MessageBreak - numbering will only work if you update ledmac}% + numbering will only work if you update ledmac,\MessageBreak + or use one of its successors, eledmac or reledmac}% }% \fi } @@ -265,6 +266,7 @@ \fi \else \MT@warn@unknown + \let\MT@char\@empty \fi \else \ifnum\MT@char=47\relax diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.cfg b/Master/texmf-dist/tex/latex/microtype/microtype.cfg index bf5ea4ede82..19788fe60ef 100644 --- a/Master/texmf-dist/tex/latex/microtype/microtype.cfg +++ b/Master/texmf-dist/tex/latex/microtype/microtype.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% Subliminal refinements towards typographical perfection -%% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2016 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 @@ -21,8 +21,8 @@ %% 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. +%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, +%% microtype-xetex.def, microtype.lua and letterspace.sty. %% %% ------------------------------------------------------------------------ %% This is the main configuration file for the `microtype' package. @@ -40,9 +40,9 @@ %% \ProvidesFile {microtype.cfg} - [2013/05/23 v2.5a + [2016/05/01 v2.6 microtype main configuration file - (RS)] + (RS)] %%% ----------------------------------------------------------------------- %%% FONT SETS @@ -51,37 +51,47 @@ { } \DeclareMicrotypeSet{allmath} - { encoding = {OT1,T1,T2A,LY1,OT4,QX,T5,EU1,EU2,TS1,OML,OMS,U} } + { encoding = {OT1,T1,T2A,LY1,OT4,QX,T5,EU1,EU2,TU,TS1,OML,OMS,U} } \DeclareMicrotypeSet{alltext} - { encoding = {OT1,T1,T2A,LY1,OT4,QX,T5,TS1,EU1,EU2} } + { encoding = {OT1,T1,T2A,LY1,OT4,QX,T5,TS1,EU1,EU2,TU} } + +\DeclareMicrotypeSet{allmath-nott} + { encoding = {OT1,T1,T2A,LY1,OT4,QX,T5,EU1,EU2,TU,TS1,OML,OMS,U}, + family = {rm*,sf*} + } + +\DeclareMicrotypeSet{alltext-nott} + { encoding = {OT1,T1,T2A,LY1,OT4,QX,T5,TS1,EU1,EU2,TU}, + family = {rm*,sf*} + } \DeclareMicrotypeSet{basicmath} - { encoding = {OT1,T1,T2A,LY1,OT4,QX,T5,EU1,EU2,OML,OMS}, + { encoding = {OT1,T1,T2A,LY1,OT4,QX,T5,EU1,EU2,TU,OML,OMS}, family = {rm*,sf*}, series = {md*}, size = {normalsize,footnotesize,small,large} } \DeclareMicrotypeSet{basictext} - { encoding = {OT1,T1,T2A,LY1,OT4,QX,T5,EU1,EU2}, + { encoding = {OT1,T1,T2A,LY1,OT4,QX,T5,EU1,EU2,TU}, family = {rm*,sf*}, series = {md*}, size = {normalsize,footnotesize,small,large} } \DeclareMicrotypeSet{smallcaps} - { encoding = {OT1,T1,T2A,LY1,OT4,QX,T5,TS1,EU1,EU2}, - shape = {sc*} + { encoding = {OT1,T1,T2A,LY1,OT4,QX,T5,TS1,EU1,EU2,TU}, + shape = {sc*,si,scit} } \DeclareMicrotypeSet{footnotesize} - { encoding = {OT1,T1,T2A,LY1,OT4,QX,T5,TS1,EU1,EU2}, + { encoding = {OT1,T1,T2A,LY1,OT4,QX,T5,TS1,EU1,EU2,TU}, size = {-small} } \DeclareMicrotypeSet{scriptsize} - { encoding = {OT1,T1,T2A,LY1,OT4,QX,T5,TS1,EU1,EU2}, + { encoding = {OT1,T1,T2A,LY1,OT4,QX,T5,TS1,EU1,EU2,TU}, size = {-footnotesize} } @@ -314,7 +324,7 @@ } \DeclareCharacterInheritance - { encoding = {EU1,EU2} } + { encoding = {EU1,EU2,TU} } { A = {\`A,\'A,\^A,\~A,\"A,\r A,\k A,\u A}, a = {\`a,\'a,\^a,\~a,\"a,\r a,\k a,\u a}, C = {\'C,\c C,\v C}, @@ -353,7 +363,7 @@ \SetTracking [ name = default, no ligatures = {f} ] - { encoding = {OT1,T1,T2A,LY1,OT4,QX,EU2} } + { encoding = {OT1,T1,T2A,LY1,OT4,QX,EU2,TU} } { } %%% ----------------------------------------------------------------------- @@ -539,7 +549,7 @@ \SetProtrusion [ name = T1-default, load = default ] - { encoding = {T1,LY1,EU1,EU2} } + { encoding = {T1,LY1,EU1,EU2,TU} } { \AE = {50, }, _ = {100,100}, diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.lua b/Master/texmf-dist/tex/latex/microtype/microtype.lua index 2da38c7d643..b6ac668d4f8 100644 --- a/Master/texmf-dist/tex/latex/microtype/microtype.lua +++ b/Master/texmf-dist/tex/latex/microtype/microtype.lua @@ -10,7 +10,7 @@ -- -- The `microtype' package -- Subliminal refinements towards typographical perfection --- Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> +-- Copyright (c) 2004--2016 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 @@ -21,33 +21,38 @@ -- 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. +-- derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, +-- microtype-xetex.def, microtype.lua and letterspace.sty. -- -- ------------------------------------------------------------------------ -- This file contains auxiliary lua functions. --- It was contributed by Elie Roux <elie.roux{at}telecom-bretagne.eu>. +-- It was originally contributed by Elie Roux <elie.roux{at}telecom-bretagne.eu>. +-- (Bugs are mine.) -- ------------------------------------------------------------------------ -- -microtype = microtype or {} -local microtype = microtype -local microtype_module = { - name = "microtype", - version = 2.5, - date = "2013/05/15", - description = "microtype module.", - author = "E. Roux, R. Schlicht and P. Gesang", - copyright = "E. Roux, R. Schlicht and P. Gesang", - license = "LPPL", +microtype = microtype or {} +local microtype = microtype +microtype.module = { + name = "microtype", + version = 2.6, + date = "2016/05/01", + description = "microtype module.", + author = "E. Roux, R. Schlicht and P. Gesang", + copyright = "E. Roux, R. Schlicht and P. Gesang", + license = "LPPL", } -if luatexbase and luatexbase.provides_module then - luatexbase.provides_module(microtype_module) -end +local err, warn, info, log = luatexbase.provides_module(microtype.module) +microtype.warning = warn + +local find = string.find +local match = string.match +local tex_write = tex.write -local find = string.find -local tex_write = tex.write +function microtype.sprint (...) + tex.sprint(luatexbase.catcodetables['latex-package'], ...) +end local function if_int(s) if find(s,"^-*[0-9]+ *$") then @@ -77,6 +82,66 @@ local function if_str_eq(s1, s2) end microtype.if_str_eq = if_str_eq +local function do_font() + if fonts then + local thefont + if fonts.ids then --- legacy luaotfload + thefont = fonts.ids[font.current()] + else --- new location + thefont = fonts.hashes.identifiers[font.current()] + end + if thefont then + for i,v in next,thefont.characters do + if v.index > 0 then + microtype.sprint([[\@tempcnta=]]..i..[[\relax\MT@dofont@function]]) + end + end + end + end +end +microtype.do_font = do_font + +microtype.ligs = microtype.ligs or { } + +local function noligatures(fontcs,liga) + local fontcs = match(fontcs,"([^ ]+)") + microtype.ligs[fontcs] = microtype.ligs[fontcs] or { } + table.insert(microtype.ligs[fontcs],liga) +end +microtype.noligatures = noligatures + +local function keepligature(c) + local nodedirect = node.direct + local getfield = nodedirect.getfield + local getfont = nodedirect.getfont + local f,ch + if type(c) == "userdata" then -- in older luaotfload versions, c was a node + f = c.font + ch = c.components.char + else -- since 2.6, c is a (direct node) number + f = getfont(c) + ch = getfield(getfield(c,"components"),"char") + end +-- if ch then -- should always be true + local ligs = microtype.ligs[match(tex.fontidentifier(f),"\\([^ ]+)")] + if ligs then + for _,lig in pairs(ligs) do + if lig == "_all_" or tonumber(lig) == ch then + return false + end + end + end + return true +-- end +end + +if luaotfload and luaotfload.letterspace then + if luaotfload.letterspace.keepligature then + microtype.warning("overwriting function `keepligature'") + end + luaotfload.letterspace.keepligature = keepligature +end + 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) diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.sty b/Master/texmf-dist/tex/latex/microtype/microtype.sty index 8f3a382b467..75d2aa3ea44 100644 --- a/Master/texmf-dist/tex/latex/microtype/microtype.sty +++ b/Master/texmf-dist/tex/latex/microtype/microtype.sty @@ -10,7 +10,7 @@ %% %% The `microtype' package %% Subliminal refinements towards typographical perfection -%% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2016 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 @@ -21,17 +21,17 @@ %% 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. +%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, +%% microtype-xetex.def, microtype.lua and letterspace.sty. %% %% ------------------------------------------------------------------------ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage {microtype} - [2013/05/23 v2.5a + [2016/05/01 v2.6 Micro-typographical refinements - (RS)] + (RS)] \def\MT@MT {microtype} \let\MT@restore@catcodes\@empty @@ -134,11 +134,11 @@ \ifx\pdftexversion\@undefined \else \ifx\pdftexversion\relax \else \def\MT@engine{pdf} - \ifx\directlua\@undefined \else - \ifx\directlua\relax \else - \def\MT@engine{lua} - \fi - \fi + \fi +\fi +\ifx\directlua\@undefined \else + \ifx\directlua\relax \else + \def\MT@engine{lua} \fi \fi \ifx\MT@engine\relax @@ -396,13 +396,13 @@ \def\MT@rbba@tracking{tr} \def\MT@features{pr,ex,sp,kn,tr} \def\MT@features@long{protrusion,expansion,spacing,kerning,tracking} -\def\MT@is@feature#1{% - \MT@exp@one@n\MT@in@clist\@tempa\MT@features@long +\def\MT@is@feature#1#2{% + \MT@in@clist{#1}\MT@features@long \ifMT@inlist@ \expandafter\@firstofone \else - \MT@error{`\@tempa' is not an available micro-typographic\MessageBreak - feature. Ignoring #1}{Available features are: `\MT@features@long'.}% + \MT@error{`#1' is not an available micro-typographic\MessageBreak + feature. Ignoring #2}{Available features are: `\MT@features@long'.}% \expandafter\@gobble \fi } @@ -422,9 +422,16 @@ } \def\MT@restore@p@h{\chardef\%`\% \chardef\#`\# } \newif\ifMT@xunicode -\newif\ifMT@fontspec \MT@with@package@T{xunicode}\MT@xunicodetrue +\newif\ifMT@fontspec \MT@with@package@T{fontspec}\MT@fontspectrue +\let\MT@if@fontspec@font\@secondoftwo +\def\MT@fontspec@setup{% + \@ifpackagelater{fontspec}{2013/05/23}{ + \MT@let@cn\MT@if@fontspec@font{fontspec_if_fontspec_font:TF}% + }\relax +} +\ifMT@fontspec\MT@fontspec@setup\fi \def\MT@setupfont@hook{% \ifMT@fontspec\MT@font\fi \MT@if@false @@ -448,11 +455,12 @@ The `pdfcprot' package provides an interface to character protrusion.\MessageBre 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 {ledmac}\MT@ledmac@setup + \MT@with@package@T {eledmac}\MT@ledmac@setup + \MT@with@package@T{reledmac}\MT@ledmac@setup \MT@with@package@T{xunicode}\MT@xunicodetrue - \MT@with@package@T{fontspec}\MT@fontspectrue - \let\MT@setupfont@hook\@empty + \MT@with@package@T{fontspec}{\MT@fontspectrue\MT@fontspec@setup}% + \MT@glet\MT@setupfont@hook\@empty \ifMT@fontspec \g@addto@macro\MT@setupfont@hook{\MT@font}% \fi @@ -1092,11 +1100,16 @@ time will almost certainly lead to undesired results. Have your choice!}% /MT@ifstreq/MT@charstring{##3##4}/relax/MT@norestfalse /else /edef/MT@char@{/number"##2##3}% - /MT@ifstreq/MT@charstring{##4}/relax/MT@norestfalse + /MT@ifstreq/MT@charstring{##4}/relax + {/MT@is@xchar##2##3|##4\CHAR"/relax}% /fi /fi /fi }% + /def/MT@is@xchar##1|##2\CHAR"##3##4/relax{% + /MT@ifstreq/MT@charstring{##3##4}% + {/edef/MT@char@{/number"##1##2}}/MT@norestfalse + }% /def/MT@charxstring{\CHAR "}% /def/MT@strip@prefix##1>##2/relax{##2}% /def/MT@is@charx##1\CHAR "##2##3##4##5##6/relax{% @@ -1160,36 +1173,48 @@ time will almost certainly lead to undesired results. Have your choice!}% { (input encoding `\@nameuse {MT@\MT@feat @\MT@cat @\csname MT@\MT@feat @\MT@cat @name\endcsname @inputenc}')}% } +\def\MT@warn@unknown@once#1{% + \def\MT@warn@unknown{% + \MT@warning@nl{One or more slots in the configuration are unknown.\MessageBreak + Make sure that no text commands are used.\MessageBreak + See the documentation for details (the note\MessageBreak + on `#1' in section 9: `Hints and caveats')}% + \MT@glet\MT@warn@unknown\relax}% +} \let\MT@font@list\@empty \let\MT@font\@empty \MT@addto@setup{% + \MT@with@package@T{luatexja}{\MT@warn@unknown@once{luatexja}}% + \MT@with@package@T{xeCJK} {\MT@warn@unknown@once{xeCJK}}% \@ifpackageloaded{CJK}{% - \@ifpackagelater{CJK}{2006/10/17}% 4.7.0 - {\def\MT@orig@pickupfont{\CJK@ifundefined\CJK@plane}}% - {\def\MT@orig@pickupfont{\@ifundefined{CJK@plane}}}% - \g@addto@macro\MT@orig@pickupfont - {{\expandafter\ifx\font@name\relax\define@newfont\fi}}% - \@ifpackageloaded{CJKutf8}% - {\@ifpackagelater{CJKutf8}{2008/05/22}% 4.8.0 - {\ifpdf\expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi}% - {\@firstoftwo}}% - {\@firstoftwo}% - {\g@addto@macro\MT@orig@pickupfont{% - {\expandafter\ifx\csname\curr@fontshape/\f@size/\CJK@plane\endcsname\relax - \define@newfont\else\xdef\font@name{% + \@ifpackageloaded{xeCJK}{\@firstofone}{% + \@ifpackagelater{CJK}{2006/10/17}% 4.7.0 + {\def\MT@orig@pickupfont{\CJK@ifundefined\CJK@plane}}% + {\def\MT@orig@pickupfont{\@ifundefined{CJK@plane}}}% + \g@addto@macro\MT@orig@pickupfont + {{\expandafter\ifx\font@name\relax\define@newfont\fi}}% + \@ifpackageloaded{CJKutf8}% + {\@ifpackagelater{CJKutf8}{2008/05/22}% 4.8.0 + {\ifpdf\expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi}% + {\@firstoftwo}}% + {\@firstoftwo}% + {\g@addto@macro\MT@orig@pickupfont{% + {\expandafter\ifx\csname\curr@fontshape/\f@size/\CJK@plane\endcsname\relax + \define@newfont\else\xdef\font@name{% + \csname \curr@fontshape/\f@size/\CJK@plane\endcsname}\fi}}}% + {\g@addto@macro\MT@orig@pickupfont{% + {\expandafter\ifx\csname \curr@fontshape/\f@size/\CJK@plane\endcsname\relax + \define@newfont\def\CJK@temp{v}% + \ifx\CJK@temp\CJK@plane + \expandafter\ifx\csname CJK@cmap@\f@family\CJK@plane\endcsname\relax + \else\csname CJK@cmap@\f@family\CJK@plane\endcsname\fi + \else \CJK@addcmap\CJK@plane \fi + \else\xdef\font@name{% \csname \curr@fontshape/\f@size/\CJK@plane\endcsname}\fi}}}% - {\g@addto@macro\MT@orig@pickupfont{% - {\expandafter\ifx\csname \curr@fontshape/\f@size/\CJK@plane\endcsname\relax - \define@newfont\def\CJK@temp{v}% - \ifx\CJK@temp\CJK@plane - \expandafter\ifx\csname CJK@cmap@\f@family\CJK@plane\endcsname\relax - \else\csname CJK@cmap@\f@family\CJK@plane\endcsname\fi - \else \CJK@addcmap\CJK@plane \fi - \else\xdef\font@name{% - \csname \curr@fontshape/\f@size/\CJK@plane\endcsname}\fi}}}% - }{% - \def\MT@orig@pickupfont{\expandafter\ifx\font@name\relax\define@newfont\fi}% - }% + \@gobble + }% + }{\@firstofone}% + {\def\MT@orig@pickupfont{\expandafter\ifx\font@name\relax\define@newfont\fi}}% \ifx\pickup@font\MT@orig@pickupfont \else \MT@warning@nl{% Command \string\pickup@font\space is not defined as expected.% @@ -1276,7 +1301,7 @@ time will almost certainly lead to undesired results. Have your choice!}% \DeclareRobustCommand\microtypecontext[1]{% \MT@setup@contexts \let\MT@reset@context\relax - \let\glb@currsize\@empty + \MT@glet\glb@currsize\@empty \setkeys{MTC}{#1}% \selectfont \MT@reset@context @@ -1318,31 +1343,35 @@ time will almost certainly lead to undesired results. Have your choice!}% \fi }% } +\define@key{MTC}{activate}[]{% + \setkeys{MT}{protrusion={#1}}% + \setkeys{MT}{expansion={#1}}% +} \MT@exp@one@n\MT@map@clist@n{\MT@features,nl}{% \MT@def@n{MT@#1@context}{@}% \MT@def@n{MT@#1@doc@contexts}{{@}}% } \let\MT@extra@context\@empty \def\DeclareMicrotypeSet{% + \MT@begin@catcodes \@ifstar \MT@DeclareSetAndUseIt \MT@DeclareSet } \newcommand\MT@DeclareSet[3][]{% - \KV@@sp@def\@tempa{#1}% - \MT@ifempty\@tempa{% + \MT@ifempty{#1}{% \MT@map@clist@c\MT@features{{\MT@declare@sets{##1}{#2}{#3}}}% }{% - \MT@map@clist@c\@tempa{{% - \KV@@sp@def\@tempa{##1}% - \MT@ifempty\@tempa\relax{% - \MT@is@feature{set declaration `#2'}{% + \MT@map@clist@n{#1}{{% + \MT@ifempty{##1}\relax{% + \MT@is@feature{##1}{set declaration `#2'}{% \MT@exp@one@n\MT@declare@sets - {\csname MT@rbba@\@tempa\endcsname}{#2}{#3}% + {\csname MT@rbba@##1\endcsname}{#2}{#3}% }% }% }}% }% + \MT@end@catcodes } \newcommand\MT@DeclareSetAndUseIt[3][]{% \MT@DeclareSet[#1]{#2}{#3}% @@ -1350,10 +1379,12 @@ time will almost certainly lead to undesired results. Have your choice!}% } \let\MT@curr@set@name\@empty \def\MT@declare@sets#1#2#3{% - \KV@@sp@def\MT@curr@set@name{#2}% + \def\MT@curr@set@name{#2}% \MT@ifdefined@n@T{MT@#1@set@@\MT@curr@set@name}{% \MT@warning{Redefining \@nameuse{MT@abbr@#1} set `\MT@curr@set@name'}% - \MT@glet@nc{MT@#1list@size@\MT@curr@set@name}\@empty + \MT@map@clist@n{font,encoding,family,series,shape,size}{% + \MT@glet@nc{MT@#1list@##1@\MT@curr@set@name}\@undefined + }% }% \MT@glet@nc{MT@#1@set@@\MT@curr@set@name}\@empty \setkeys{MT@#1@set}{#3}% @@ -1384,16 +1415,18 @@ time will almost certainly lead to undesired results. Have your choice!}% } \let\MT@font@sets\@empty \def\MT@fix@font@set#1{% - \xdef#1{#1}% - \ifMT@fontspec - \xdef#1{\expandafter\MT@scrubfeatures#1()\relax}% - \fi - \global\@onelevel@sanitize#1% + \MT@ifdefined@c@T{#1}{% + \xdef#1{#1}% + \ifMT@fontspec + \xdef#1{\expandafter\MT@scrubfeatures#1()\relax}% + \fi + \global\@onelevel@sanitize#1% + }% } \def\MT@define@set@key@size#1{% \define@key{MT@#1@set}{size}[]{% \MT@map@clist@n{##1}{% - \KV@@sp@def\MT@val{####1}% + \def\MT@val{####1}% \expandafter\MT@get@range\MT@val--\@nil \ifx\MT@val\relax \else \MT@exp@cs\MT@xadd @@ -1467,7 +1500,7 @@ time will almost certainly lead to undesired results. Have your choice!}% \define@key{MT@#1@set}{font}[]{% \MT@glet@nc{MT@#1list@font@\MT@curr@set@name}\@empty \MT@map@clist@n{##1}{% - \KV@@sp@def\MT@val{####1}% + \def\MT@val{####1}% \MT@ifstreq\MT@val*{\def\MT@val{*/*/*/*/*}}\relax \expandafter\MT@get@font\MT@val/////\@nil \MT@exp@two@n\g@addto@macro @@ -1521,87 +1554,97 @@ time will almost certainly lead to undesired results. Have your choice!}% \MT@define@set@key@size {#1}% \MT@define@set@key@font {#1}% } -\renewcommand*\UseMicrotypeSet[2][]{% - \KV@@sp@def\@tempa{#1}% - \MT@ifempty\@tempa{% +\def\UseMicrotypeSet{% + \MT@begin@catcodes + \MT@UseMicrotypeSet +} +\newcommand*\MT@UseMicrotypeSet[2][]{% + \MT@ifempty{#1}{% \MT@map@clist@c\MT@features{{\MT@use@set{##1}{#2}}}% }{% - \MT@map@clist@c\@tempa{{% - \KV@@sp@def\@tempa{##1}% - \MT@ifempty\@tempa\relax{% - \MT@is@feature{activation of set `#2'}{% + \MT@map@clist@n{#1}{{% + \MT@ifempty{##1}\relax{% + \MT@is@feature{##1}{activation of set `#2'}{% \MT@exp@one@n\MT@use@set - {\csname MT@rbba@\@tempa\endcsname}{#2}% + {\csname MT@rbba@##1\endcsname}{#2}% }% }% }}% }% + \MT@end@catcodes } \def\MT@use@set#1#2{% - \KV@@sp@def\@tempa{#2}% - \MT@ifdefined@n@TF{MT@#1@set@@\@tempa}{% - \MT@xdef@n{MT@#1@setname}{\@tempa}% + \MT@ifdefined@n@TF{MT@#1@set@@#2}{% + \MT@xdef@n{MT@#1@setname}{#2}% }{% \MT@ifdefined@n@TF{MT@#1@setname}\relax{% \MT@xdef@n{MT@#1@setname}{\@nameuse{MT@default@#1@set}}% }% \MT@error{% - The \@nameuse{MT@abbr@#1} set `\@tempa' is undeclared.\MessageBreak + The \@nameuse{MT@abbr@#1} set `#2' is undeclared.\MessageBreak Using set `\@nameuse{MT@#1@setname}' instead}{}% }% } -\renewcommand*\DeclareMicrotypeSetDefault[2][]{% - \KV@@sp@def\@tempa{#1}% - \MT@ifempty\@tempa{% +\def\DeclareMicrotypeSetDefault{% + \MT@begin@catcodes + \MT@DeclareMicrotypeSetDefault +} +\newcommand*\MT@DeclareMicrotypeSetDefault[2][]{% + \MT@ifempty{#1}{% \MT@map@clist@c\MT@features{{\MT@set@default@set{##1}{#2}}}% }{% - \MT@map@clist@c\@tempa{{% - \KV@@sp@def\@tempa{##1}% - \MT@ifempty\@tempa\relax{% - \MT@is@feature{declaration of default set `#2'}{% + \MT@map@clist@n{#1}{{% + \MT@ifempty{##1}\relax{% + \MT@is@feature{##1}{declaration of default set `#2'}{% \MT@exp@one@n\MT@set@default@set - {\csname MT@rbba@\@tempa\endcsname}{#2}% + {\csname MT@rbba@##1\endcsname}{#2}% }% }% }}% }% + \MT@end@catcodes } \def\MT@set@default@set#1#2{% - \KV@@sp@def\@tempa{#2}% - \MT@ifdefined@n@TF{MT@#1@set@@\@tempa}{% - \MT@xdef@n{MT@default@#1@set}{\@tempa}% + \MT@ifdefined@n@TF{MT@#1@set@@#2}{% + \MT@xdef@n{MT@default@#1@set}{#2}% }{% \MT@error{% - The \@nameuse{MT@abbr@#1} set `\@tempa' is not declared.\MessageBreak + The \@nameuse{MT@abbr@#1} set `#2' is not declared.\MessageBreak Cannot make it the default set. Using set\MessageBreak `all' instead}{}% \MT@xdef@n{MT@default@#1@set}{all}% }% } \let\MT@variants\@empty \def\DeclareMicrotypeVariants{% + \MT@begin@catcodes \@ifstar \MT@DeclareVariants {\let\MT@variants\@empty\MT@DeclareVariants}% } \def\MT@DeclareVariants#1{% \MT@map@clist@n{#1}{% - \KV@@sp@def\@tempa{##1}% + \def\@tempa{##1}% \@onelevel@sanitize\@tempa \xdef\MT@variants{\MT@variants{\@tempa}}% }% + \MT@end@catcodes } -\renewcommand*\DeclareMicrotypeAlias[2]{% - \edef\@tempa{\zap@space#1 \@empty}% - \edef\@tempb{\zap@space#2 \@empty}% +\def\DeclareMicrotypeAlias{% + \MT@begin@catcodes + \MT@DeclareMicrotypeAlias +} +\newcommand*\MT@DeclareMicrotypeAlias[2]{% + \def\@tempb{#2}% \@onelevel@sanitize\@tempb - \MT@ifdefined@n@T{MT@\@tempa @alias}{% + \MT@ifdefined@n@T{MT@#1@alias}{% \MT@warning{Alias font family `\@tempb' will override - alias `\@nameuse{MT@\@tempa @alias}'\MessageBreak - for font family `\@tempa'}}% - \MT@xdef@n{MT@\@tempa @alias}{\@tempb}% + alias `\@nameuse{MT@#1@alias}'\MessageBreak + for font family `#1'}}% + \MT@xdef@n{MT@#1@alias}{\@tempb}% \MT@ifdefined@c@T\MT@family{% \MT@glet\MT@familyalias\@tempb }% + \MT@end@catcodes } \def\LoadMicrotypeFile#1{% \edef\@tempa{\zap@space#1 \@empty}% @@ -1616,8 +1659,8 @@ time will almost certainly lead to undesired results. Have your choice!}% \edef\MT@curr@file{mt-\@tempa.cfg}% \MT@vinfo{... Loading configuration file \MT@curr@file}% }{% - \MT@warning{... Configuration file mt-\@tempa.cfg\MessageBreak - does not exist}% + \MT@warning{Configuration file mt-\@tempa.cfg\MessageBreak + does not exist}% }% \MT@end@catcodes \fi @@ -2068,9 +2111,9 @@ time will almost certainly lead to undesired results. Have your choice!}% } \let\MT@endinput\relax \ifx\MT@engine\relax - \MT@warning@nl{You don't seem to be using either pdftex, luatex, or xetex.\MessageBreak + \MT@warning@nl{You don't seem to be using pdftex, luatex or xetex.\MessageBreak `\MT@MT' only works with these engines.\MessageBreak - I will quit now.} + I will quit now} \MT@clear@options \else \input{microtype-\MT@engine tex.def} diff --git a/Master/texmf-dist/tex/latex/microtype/mt-CharisSIL.cfg b/Master/texmf-dist/tex/latex/microtype/mt-CharisSIL.cfg index 8111bb4a8f8..7423b898f31 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-CharisSIL.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-CharisSIL.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% Subliminal refinements towards typographical perfection -%% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2016 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 @@ -21,8 +21,8 @@ %% 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. +%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, +%% microtype-xetex.def, microtype.lua and letterspace.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. @@ -43,9 +43,9 @@ %%% ----------------------------------------------------------------------- %%% INHERITANCE -%% for xetex (EU1) and luatex (EU2) +%% for xetex (EU1) and luatex (EU2), resp. both (TU) \DeclareCharacterInheritance - { encoding = {EU1,EU2}, + { encoding = {EU1,EU2,TU}, family = Charis SIL } { A = {À,Á,Â,Ã,Ä,Å,Ā,Ă,Ą,Ǎ,Ǟ,Ǡ,Ȧ,Ǻ,Ȁ,Ȃ,Ḁ,Ạ,Ả,Ấ,Ầ,Ẩ,Ẫ,Ậ,Ắ,Ằ,Ẳ,Ẵ,Ặ,Ꜳ, А,Ӑ,Ӓ}, % Cyrillic @@ -173,7 +173,7 @@ \SetProtrusion [ name = Charis-default ] - { encoding = {EU1,EU2}, + { encoding = {EU1,EU2,TU}, family = Charis SIL } { A = {50,50}, @@ -346,7 +346,7 @@ \SetProtrusion [ name = Charis-it ] - { encoding = {EU1,EU2}, + { encoding = {EU1,EU2,TU}, family = Charis SIL, shape = {it,sl} } { @@ -451,7 +451,7 @@ \SetProtrusion [ name = Charis-sc, load = Charis-default ] - { encoding = {EU1,EU2}, + { encoding = {EU1,EU2,TU}, family = Charis SIL, shape = {sc} } { diff --git a/Master/texmf-dist/tex/latex/microtype/mt-LatinModernRoman.cfg b/Master/texmf-dist/tex/latex/microtype/mt-LatinModernRoman.cfg index 4c1927acaa6..103e810e6ca 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-LatinModernRoman.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-LatinModernRoman.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% Subliminal refinements towards typographical perfection -%% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2016 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 @@ -21,8 +21,8 @@ %% 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. +%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, +%% microtype-xetex.def, microtype.lua and letterspace.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. @@ -43,9 +43,9 @@ %%% ----------------------------------------------------------------------- %%% INHERITANCE -%% for xetex (EU1) and luatex (EU2) +%% for xetex (EU1) and luatex (EU2), resp. both (TU) \DeclareCharacterInheritance - { encoding = {EU1,EU2}, + { encoding = {EU1,EU2,TU}, family = Latin Modern Roman } { A = {À,Á,Â,Ã,Ä,Å,Ā,Ă,Ą,Ǻ,Ȁ,Ạ,Ả,Ấ,Ầ,Ẩ,Ẫ,Ậ,Ắ,Ằ,Ẳ,Ặ, Α}, % Greek @@ -109,7 +109,7 @@ \SetProtrusion [ name = LMR-default ] - { encoding = {EU1,EU2}, + { encoding = {EU1,EU2,TU}, family = Latin Modern Roman } { A = {50,50}, @@ -206,7 +206,7 @@ \SetProtrusion [ name = LMR-it ] - { encoding = {EU1,EU2}, + { encoding = {EU1,EU2,TU}, family = Latin Modern Roman, shape = {it,sl} } { diff --git a/Master/texmf-dist/tex/latex/microtype/mt-PalatinoLinotype.cfg b/Master/texmf-dist/tex/latex/microtype/mt-PalatinoLinotype.cfg index cadb4a0a4d1..eee8fb6b4eb 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-PalatinoLinotype.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-PalatinoLinotype.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% Subliminal refinements towards typographical perfection -%% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2016 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 @@ -21,8 +21,8 @@ %% 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. +%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, +%% microtype-xetex.def, microtype.lua and letterspace.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. @@ -52,9 +52,9 @@ %%% ----------------------------------------------------------------------- %%% INHERITANCE -%% for xetex (EU1) and luatex (EU2) +%% for xetex (EU1) and luatex (EU2), resp. both (TU) \DeclareCharacterInheritance - { encoding = {EU1,EU2}, + { encoding = {EU1,EU2,TU}, family = {PalatinoLinotype} } { A = {À,Á,Â,Ã,Ä,Ā,Ă,Ą,Ǎ,Ǟ,Ǡ,Ȧ,Ǻ,Ȁ,Ȃ,Ḁ,Ạ,Ả,Ấ,Ầ,Ẩ,Ẫ,Ậ,Ắ,Ằ,Ẳ,Ẵ,Ặ,Ꜳ}, B = {Ḃ,Ḅ,Ḇ}, @@ -113,7 +113,7 @@ \SetProtrusion [ name = palatino-default ] - { encoding = {EU1,EU2}, + { encoding = {EU1,EU2,TU}, family = {PalatinoLinotype} } { A = {50,50}, @@ -208,7 +208,7 @@ \SetProtrusion [ name = palatino-it ] - { encoding = {EU1,EU2}, + { encoding = {EU1,EU2,TU}, family = {PalatinoLinotype}, shape = {it,sl} } { @@ -301,7 +301,7 @@ \SetProtrusion [ name = palatino-sc, load = palatino-default ] - { encoding = {EU1,EU2}, + { encoding = {EU1,EU2,TU}, family = {PalatinoLinotype}, shape = sc } { diff --git a/Master/texmf-dist/tex/latex/microtype/mt-bch.cfg b/Master/texmf-dist/tex/latex/microtype/mt-bch.cfg index 7df10b52389..7dad5ffff4d 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-bch.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-bch.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% Subliminal refinements towards typographical perfection -%% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2016 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 @@ -21,8 +21,8 @@ %% 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. +%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, +%% microtype-xetex.def, microtype.lua and letterspace.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. @@ -308,7 +308,6 @@ \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 1db4079a31d..c696af8282d 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-blg.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-blg.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% Subliminal refinements towards typographical perfection -%% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2016 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 @@ -21,8 +21,8 @@ %% 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. +%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, +%% microtype-xetex.def, microtype.lua and letterspace.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. @@ -177,7 +177,6 @@ \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 a6e2d5bd6ec..c72e8974355 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-cmr.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-cmr.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% Subliminal refinements towards typographical perfection -%% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2016 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 @@ -21,8 +21,8 @@ %% 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. +%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, +%% microtype-xetex.def, microtype.lua and letterspace.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-euf.cfg b/Master/texmf-dist/tex/latex/microtype/mt-euf.cfg index 816760339c9..963e6a157a7 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-euf.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-euf.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% Subliminal refinements towards typographical perfection -%% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2016 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 @@ -21,8 +21,8 @@ %% 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. +%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, +%% microtype-xetex.def, microtype.lua and letterspace.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. @@ -89,7 +89,6 @@ ] = { ,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 0e7be3b2277..a75ab9f5e3c 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-eur.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-eur.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% Subliminal refinements towards typographical perfection -%% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2016 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 @@ -21,8 +21,8 @@ %% 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. +%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, +%% microtype-xetex.def, microtype.lua and letterspace.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. @@ -120,7 +120,6 @@ "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 8bf2256adfd..ff9c820a1d4 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-euroitc.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-euroitc.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% Subliminal refinements towards typographical perfection -%% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2016 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 @@ -21,8 +21,8 @@ %% 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. +%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, +%% microtype-xetex.def, microtype.lua and letterspace.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. @@ -58,7 +58,6 @@ 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 6a133c6c50c..ccc79347818 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-eus.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-eus.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% Subliminal refinements towards typographical perfection -%% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2016 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 @@ -21,8 +21,8 @@ %% 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. +%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, +%% microtype-xetex.def, microtype.lua and letterspace.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. @@ -169,7 +169,6 @@ "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 16bfe648ce7..eb69b29d570 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-msa.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-msa.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% Subliminal refinements towards typographical perfection -%% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2016 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 @@ -21,8 +21,8 @@ %% 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. +%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, +%% microtype-xetex.def, microtype.lua and letterspace.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. @@ -145,7 +145,6 @@ "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 4a3f19fc457..84985524684 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-msb.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-msb.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% Subliminal refinements towards typographical perfection -%% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2016 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 @@ -21,8 +21,8 @@ %% 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. +%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, +%% microtype-xetex.def, microtype.lua and letterspace.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. @@ -147,7 +147,6 @@ "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 2b5e1901cc7..10d11525cfb 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-mvs.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-mvs.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% Subliminal refinements towards typographical perfection -%% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2016 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 @@ -21,8 +21,8 @@ %% 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. +%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, +%% microtype-xetex.def, microtype.lua and letterspace.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. @@ -59,7 +59,6 @@ 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 0da1afc6f33..cb2c6fadeec 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-pad.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-pad.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% Subliminal refinements towards typographical perfection -%% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2016 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 @@ -21,8 +21,8 @@ %% 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. +%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, +%% microtype-xetex.def, microtype.lua and letterspace.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. @@ -318,7 +318,6 @@ \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 603f65a6e35..767ce08b938 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-pmn.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-pmn.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% Subliminal refinements towards typographical perfection -%% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2016 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 @@ -21,8 +21,8 @@ %% 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. +%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, +%% microtype-xetex.def, microtype.lua and letterspace.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. @@ -610,7 +610,6 @@ \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 c9e705db381..77364b1262d 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-ppl.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-ppl.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% Subliminal refinements towards typographical perfection -%% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2016 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 @@ -21,8 +21,8 @@ %% 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. +%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, +%% microtype-xetex.def, microtype.lua and letterspace.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. @@ -223,7 +223,6 @@ \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 18480aa61b1..c4851a0e9fb 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% Subliminal refinements towards typographical perfection -%% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2016 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 @@ -21,8 +21,8 @@ %% 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. +%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, +%% microtype-xetex.def, microtype.lua and letterspace.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. @@ -369,7 +369,6 @@ \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 07b6c18d449..33e2b1f24cf 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-ugm.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-ugm.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% Subliminal refinements towards typographical perfection -%% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2016 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 @@ -21,8 +21,8 @@ %% 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. +%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, +%% microtype-xetex.def, microtype.lua and letterspace.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. @@ -252,7 +252,6 @@ \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 bf8c8dc943d..b87eec44013 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-zpeu.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-zpeu.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% Subliminal refinements towards typographical perfection -%% Copyright (c) 2004--2013 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2016 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 @@ -21,8 +21,8 @@ %% 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. +%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, +%% microtype-xetex.def, microtype.lua and letterspace.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. @@ -81,7 +81,6 @@ E = {200, } } - \endinput %% %% End of file `mt-zpeu.cfg'. |