diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/microtype/microtype.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/microtype/microtype.sty | 288 |
1 files changed, 141 insertions, 147 deletions
diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.sty b/Master/texmf-dist/tex/latex/microtype/microtype.sty index 0780299e6e0..496d7dae339 100644 --- a/Master/texmf-dist/tex/latex/microtype/microtype.sty +++ b/Master/texmf-dist/tex/latex/microtype/microtype.sty @@ -6,27 +6,27 @@ %% %% microtype.dtx (with options: `package') %% -%% ----------------------------------------------------------------------- -%% The `microtype' package +%% ------------------------------------------------------------------------ +%% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX %% Copyright (c) 2004--2006 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.3 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.3 or later -%% is part of all distributions of LaTeX version 2003/12/01 or later. +%% 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 file microtype.sty. %% -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{microtype}[2006/05/05 - v1.9d +\ProvidesPackage{microtype}[2006/07/28 + v1.9e Micro-typography with pdfTeX (RS)] \newcommand*\DeclareMicrotypeSet[3][]{} \newcommand*\UseMicrotypeSet[2][]{} @@ -40,28 +40,28 @@ \newcommand*\microtypesetup[1]{} \newcommand*\microtypecontext[1]{} \def\DeclareMicrotypeSet#1#{\@gobbletwo} -\@onlypreamble{\DeclareMicrotypeSet} -\@onlypreamble{\UseMicrotypeSet} -\@onlypreamble{\DeclareMicrotypeSetDefault} -\@onlypreamble{\DisableLigatures} +\@onlypreamble\DeclareMicrotypeSet +\@onlypreamble\UseMicrotypeSet +\@onlypreamble\DeclareMicrotypeSetDefault +\@onlypreamble\DisableLigatures \def\MT@old@cmd#1#2{% \newcommand*#1{\MT@warning{% \string#1 is deprecated. Please use\MessageBreak \string#2 instead}% \let #1#2#2}} -\MT@old@cmd\DeclareMicroTypeSet\DeclareMicrotypeSet -\MT@old@cmd\UseMicroTypeSet\UseMicrotypeSet \MT@old@cmd\DeclareMicroTypeAlias\DeclareMicrotypeAlias -\MT@old@cmd\LoadMicroTypeFile\LoadMicrotypeFile +\MT@old@cmd\DeclareMicroTypeSet \DeclareMicrotypeSet +\MT@old@cmd\UseMicroTypeSet \UseMicrotypeSet +\MT@old@cmd\LoadMicroTypeFile \LoadMicrotypeFile \def\MT@MT{microtype} -\def\MT@error{\PackageError{\MT@MT}} -\def\MT@warning{\PackageWarning{\MT@MT}} +\def\MT@error{\PackageError\MT@MT} +\def\MT@warning{\PackageWarning\MT@MT} \def\MT@warning@nl#1{\MT@warning{#1\@gobble}} \def\MT@warn@err#1{\MT@error{#1}{% This error message appears because you loaded the `\MT@MT'\MessageBreak package with the option `verbose=errors'. Consult the documentation\MessageBreak in \MT@MT.(pdf,dvi) to find out what went wrong.}} -\def\MT@info{\PackageInfo{\MT@MT}} +\def\MT@info{\PackageInfo\MT@MT} \def\MT@info@nl#1{\MT@info{#1\@gobble}} \let\MT@vinfo\@gobble \let\MT@pdftex@no\z@ @@ -135,7 +135,6 @@ \newif\ifMT@selected \newif\ifMT@noligatures \newif\ifMT@draft -\newif\ifMT@document \let\MT@pr@level\tw@ \let\MT@pr@factor\@m \let\MT@pr@unit\@empty @@ -152,6 +151,7 @@ \def\MT@stretch@default{20 } \def\MT@shrink@default{20 } \def\MT@step@default{4 } +\newif\ifMT@document \expandafter\let\expandafter\MT@requires@etex \ifcase 0% \ifx\eTeXversion\@undefined 1\else @@ -183,64 +183,32 @@ #1\expandafter\expandafter\expandafter {\expandafter#2\expandafter}\expandafter{#3}} \MT@requires@etex{ - \def\MT@ifdefined@c@T#1{% - \ifdefined#1% - \expandafter\@firstofone - \else - \expandafter\@gobble - \fi + \def\MT@ifdefined@c@T#1{\ifdefined#1% + \expandafter\@firstofone\else\expandafter\@gobble\fi } - \def\MT@ifdefined@c@TF#1{% - \ifdefined#1% - \expandafter\@firstoftwo - \else - \expandafter\@secondoftwo - \fi + \def\MT@ifdefined@c@TF#1{\ifdefined#1% + \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi } - \def\MT@ifdefined@n@T#1{% - \ifcsname#1\endcsname - \expandafter\@firstofone - \else - \expandafter\@gobble - \fi + \def\MT@ifdefined@n@T#1{\ifcsname#1\endcsname + \expandafter\@firstofone\else\expandafter\@gobble\fi } - \def\MT@ifdefined@n@TF#1{% - \ifcsname#1\endcsname - \expandafter\@firstoftwo - \else - \expandafter\@secondoftwo - \fi + \def\MT@ifdefined@n@TF#1{\ifcsname#1\endcsname + \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi } }{ - \def\MT@ifdefined@c@T#1{% - \ifx#1\@undefined - \expandafter\@gobble - \else - \expandafter\@firstofone - \fi + \def\MT@ifdefined@c@T#1{\ifx#1\@undefined + \expandafter\@gobble\else\expandafter\@firstofone\fi } - \def\MT@ifdefined@c@TF#1{% - \ifx#1\@undefined - \expandafter\@secondoftwo - \else - \expandafter\@firstoftwo - \fi + \def\MT@ifdefined@c@TF#1{\ifx#1\@undefined + \expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi } - \def\MT@ifdefined@n@T#1{% - \begingroup\MT@exp@two@c\endgroup + \def\MT@ifdefined@n@T#1{\begingroup\MT@exp@two@c\endgroup \ifx\csname #1\endcsname\relax - \expandafter\@gobble - \else - \expandafter\@firstofone - \fi + \expandafter\@gobble\else\expandafter\@firstofone\fi } - \def\MT@ifdefined@n@TF#1{% - \begingroup\MT@exp@two@c\endgroup + \def\MT@ifdefined@n@TF#1{\begingroup\MT@exp@two@c\endgroup \ifx\csname #1\endcsname\relax - \expandafter\@secondoftwo - \else - \expandafter\@firstoftwo - \fi + \expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi } } \MT@requires@etex{ @@ -282,7 +250,7 @@ \MT@requires@pdftex6{ \def\MT@ifdimen#1{% \ifcase\pdfmatch{^([0-9]+([.,][0-9]+)?|[.,][0-9]+)% - (em|ex|cm|mm|in|pc|pt|dd|cc|bp|sp|nd|nc)? *$}{#1}\relax + (em|ex|cm|mm|in|pc|pt|dd|cc|bp|sp|nd|nc|px)? *$}{#1}\relax \expandafter\@secondoftwo \else \expandafter\@firstoftwo @@ -378,15 +346,9 @@ \expandafter\x\expandafter,#2,#1,\@empty\@nnil } \def\MT@rem@from@clist#1#2{% - \def\x##1,#1,##2##3\@nnil{% - \ifx##2\@empty\else - \ifx\\##1\\\global\let#2\@gobble - \else\xdef#2{\@gobble##1}\fi - \def\x####1,#1,####2####3\@nnil{\xdef#2{#2####1}}% - \x,##2##3,#1,\@nnil - \fi - }% - \expandafter\x\expandafter,#2,#1,\@empty\@nnil + \def\x##1,#1,##2\x{##1,##2\y}% + \def\y##1,\y##2\y{\ifx,##1\@empty\else##1\fi}% + \xdef#2{\MT@exp@two@c\y\x\expandafter,#2,\y,#1,\x}% } \def\MT@in@tlist#1#2{% \MT@inlist@false @@ -410,7 +372,7 @@ \MT@ifdim{#1}=\MT@size \MT@inlist@true \relax - }{% + }{% \MT@ifdim\MT@size<{#1}\relax{% \MT@ifdim\MT@size<{#2}% \MT@inlist@true @@ -485,13 +447,8 @@ \fi } \let\MT@setup@\@empty -\def\MT@addto@setup#1{% - \begingroup - \MT@toks\expandafter{\MT@setup@#1}% - \xdef\MT@setup@{\the\MT@toks}% - \endgroup -} -\AtBeginDocument{\MT@setup@} +\def\MT@addto@setup{\g@addto@macro\MT@setup@} +\AtBeginDocument{\MT@setup@ \global\let\MT@setup@\@empty} \def\MT@with@package#1{\@ifpackageloaded{#1}\@firstofone\@gobble} \def\MT@pdfcprot@error{% \MT@error{Detected the `pdfcprot' package!\MessageBreak @@ -502,9 +459,9 @@ time will almost certainly lead to undesired results. Have your choice!}% \let\MT@pdfcprot@error\relax } \MT@with@package{pdfcprot}\MT@pdfcprot@error -\def\MT@ledmac@setup{% - \ifMT@protrusion - \MT@requires@pdftex5{% +\MT@requires@pdftex5{ + \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 @@ -522,14 +479,18 @@ time will almost certainly lead to undesired results. Have your choice!}% Character protrusion in paragraphs with line\MessageBreak numbering will only work if you update ledmac}% }% - }{% + \fi + } +}{ + \def\MT@ledmac@setup{% + \ifMT@protrusion \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 Upgrade pdftex to version 1.30 or later}% - }% - \fi + \fi + } } \def\MT@restore@p@h{\chardef\%`\% \chardef\#`\# } \def\MT@setupfont@hook{% @@ -842,6 +803,7 @@ time will almost certainly lead to undesired results. Have your choice!}% \@tempcntb=#1\relax } \def\MT@get@opt{% + \MT@set@listname \MT@ifdefined@n@TF{MT@\MT@feat @c@\csname MT@\MT@feat @c@name\endcsname @factor}{% \MT@let@nn{MT@\MT@feat @factor@} {MT@\MT@feat @c@\csname MT@\MT@feat @c@name\endcsname @factor}% @@ -876,8 +838,9 @@ time will almost certainly lead to undesired results. Have your choice!}% \expandafter\MT@get@unit\csname MT@\MT@feat @unit@\endcsname \fi \fi + \def\MT@cat{c}% + \MT@set@inputenc \MT@ifdefined@n@T{MT@\MT@feat @c@\csname MT@\MT@feat @c@name\endcsname @preset}{% - \MT@set@listname \csname MT@preset@\MT@feat\endcsname \MT@let@nc{MT@reset@\MT@feat @codes}\relax }% @@ -910,6 +873,19 @@ time will almost certainly lead to undesired results. Have your choice!}% \fi \fi } +\def\MT@set@inputenc{% + \MT@ifdefined@n@T + {MT@\MT@feat @\MT@cat @\csname MT@\MT@feat @\MT@cat @name\endcsname @inputenc}{% + \MT@ifdefined@c@TF\inputencoding{% + \inputencoding{\@nameuse{% + MT@\MT@feat @\MT@cat @\csname MT@\MT@feat @\MT@cat @name\endcsname @inputenc}}% + }{% + \MT@error{Key `inputenc' used in \MT@curr@list@name, but the `inputenc' + \MessageBreak package isn't loaded}% + {You must load the `inputenc' package before you can use the `inputenc' key.}% + }% + }% +} \def\MT@set@pr@heirs#1{% \lpcode\MT@font#1=\lpcode\MT@font\MT@char \rpcode\MT@font#1=\rpcode\MT@font\MT@char @@ -1029,6 +1005,7 @@ time will almost certainly lead to undesired results. Have your choice!}% \@tempcntb=#1\relax } \def\MT@get@ex@opt{% + \MT@set@listname \MT@ifdefined@n@TF{MT@ex@c@\MT@ex@c@name @factor}{% \MT@let@cn\MT@ex@factor@{MT@ex@c@\MT@ex@c@name @factor}% \MT@vinfo{... : Multiplying expansion factors by \number\MT@ex@factor@/1000}% @@ -1040,8 +1017,9 @@ time will almost certainly lead to undesired results. Have your choice!}% \MT@get@ex@opt@{step} {Setting expansion step to \number\MT@step@}% \def\@tempa{autoexpand}% \MT@get@ex@opt@{auto}{\ifx\@tempa\MT@auto@ En\else Dis\fi abling automatic expansion}% + \def\MT@cat{c}% + \MT@set@inputenc \MT@ifdefined@n@T{MT@ex@c@\csname MT@ex@c@name\endcsname @preset}{% - \MT@set@listname \MT@preset@ex \let\MT@reset@ef@codes\relax }% @@ -1193,7 +1171,7 @@ time will almost certainly lead to undesired results. Have your choice!}% /\ifnum#2=\@ne \MT@series\fi /\ifnum#3=\@ne \MT@shape\fi /\ifnum#4=\@ne *\fi - \MT@context}% + \MT@context}% \MT@ifdefined@n@T{MT@\@tempb @\@tempa}{% \MT@next@listname@#4% }% @@ -1233,7 +1211,7 @@ time will almost certainly lead to undesired results. Have your choice!}% for font\MessageBreak`\MT@exp@string\MT@font'% \ifx\MT@context\@empty\else\space(context: `\MT@context')\fi. Switching off\MessageBreak\@nameuse{MT@abbr@\MT@feat} for this font}% - \fi + \fi \@secondoftwo }% } @@ -1246,8 +1224,12 @@ time will almost certainly lead to undesired results. Have your choice!}% \ifx\@tempc\@empty \else \MT@let@cn\MT@inh@name{MT@\MT@feat @inh@name}% \edef\MT@curr@list@name{inheritance list\MessageBreak`\MT@inh@name'}% + \begingroup + \def\MT@cat{inh}% + \MT@set@inputenc \expandafter\MT@inh@do\@tempc,\relax,% \global\MT@let@nc{MT@\MT@feat @inh@\csname MT@\MT@feat @inh@name\endcsname}\@empty + \endgroup \fi }{% \MT@let@nc{MT@\MT@feat @inh@name}\@undefined @@ -1396,13 +1378,23 @@ time will almost certainly lead to undesired results. Have your choice!}% \def\MT@warn@rest{% \MT@warning@nl{% Unknown slot number of character\MessageBreak`\the\MT@toks'\MessageBreak - in font encoding `\MT@encoding'. Make sure it's a single\MessageBreak - character (or a number) in \MT@curr@list@name}% + in font encoding `\MT@encoding'\MT@warn@maybe@inputenc + Make sure it's a single character\MessageBreak + (or a number) in \MT@curr@list@name}% } \def\MT@warn@unknown{% \MT@warning@nl{% Unknown slot number of character\MessageBreak`\the\MT@toks'\MessageBreak - in font encoding `\MT@encoding' in \MT@curr@list@name}% + in font encoding `\MT@encoding'\MT@warn@maybe@inputenc + in \MT@curr@list@name}% +} +\def\MT@warn@maybe@inputenc{% + \MT@ifdefined@n@T + {MT@\MT@feat @\MT@cat @\csname MT@\MT@feat @\MT@cat @name\endcsname @inputenc}% + { (input encoding `% + \@nameuse + {MT@\MT@feat @\MT@cat @\csname MT@\MT@feat @\MT@cat @name\endcsname @inputenc}')% + \MessageBreak}% } \let\MT@font@list\@empty \let\MT@font\@empty @@ -1418,8 +1410,9 @@ time will almost certainly lead to undesired results. Have your choice!}% applied to the document.\MessageBreak (Hint: Turn on `verbose' mode)% } \fi + \g@addto@macro\pickup@font{\begingroup} + \MT@with@package{trace}{\g@addto@macro\pickup@font{\conditionally@traceoff}} \g@addto@macro\pickup@font{% - \begingroup \escapechar\m@ne \ifx\MT@font\@empty \let\MT@font\font@name @@ -1433,8 +1426,8 @@ time will almost certainly lead to undesired results. Have your choice!}% \MT@setupfont \MT@register@font \fi + \global\let\MT@font\@empty \endgroup - \global\let\MT@font\@empty } \let\MT@pickupfont\pickup@font \let\MT@orig@add@accent\add@accent @@ -1607,9 +1600,7 @@ time will almost certainly lead to undesired results. Have your choice!}% } \def\MT@test@ast#1*#2\@nil{% \def\@tempa{#1}% - \MT@ifempty{#2}% - \@gobble - \@firstofone + \MT@ifempty{#2}\@gobble\@firstofone } \def\MT@fix@font@spec#1{% \xdef#1{#1}% @@ -1644,11 +1635,9 @@ time will almost certainly lead to undesired results. Have your choice!}% \ifx\MT@val\relax \else \edef\MT@lower{\MT@val}% \MT@ifempty{#2}{% - \MT@ifempty{#3}{% - \def\MT@upper{-1}% - }{% - \def\MT@upper{2048}% - }% + \MT@ifempty{#3}% + {\def\MT@upper{-1}}% + {\def\MT@upper{2048}}% }{% \def\MT@val{#2}% \MT@get@size @@ -1662,9 +1651,9 @@ time will almost certainly lead to undesired results. Have your choice!}% }{% \edef\MT@upper{\MT@val}% }% - \MT@ifdim\MT@lower=\MT@upper{% - \def\MT@upper{-1}% - }\relax + \MT@ifdim\MT@lower=\MT@upper + {\def\MT@upper{-1}}% + \relax \fi }% \fi @@ -1773,6 +1762,21 @@ time will almost certainly lead to undesired results. Have your choice!}% Using set `\@nameuse{MT@#1@setname}' instead}% }% } +\MT@requires@pdftex5{ + \renewcommand*\DisableLigatures[1]{% + \edef\MT@active@features{\MT@active@features,nl}% + \MT@noligaturestrue + \MT@declare@sets{nl}{no ligatures}{#1}% + \gdef\MT@nl@setname{no ligatures}% + } +}{ + \renewcommand*\DisableLigatures[1]{% + \MT@warning{Disabling ligatures of a font is only possible\MessageBreak + with pdftex version 1.30 or newer.\MessageBreak + Ignoring \string\DisableLigatures}% + \global\let\DisableLigatures\@gobble + } +} \renewcommand*\DeclareMicrotypeSetDefault[2][]{% \KV@@sp@def\@tempa{#1}% \MT@ifempty\@tempa{% @@ -1832,28 +1836,13 @@ time will almost certainly lead to undesired results. Have your choice!}% \MT@end@catcodes \fi } -\MT@requires@pdftex5{ - \renewcommand*\DisableLigatures[1]{% - \edef\MT@active@features{\MT@active@features,nl}% - \MT@noligaturestrue - \MT@declare@sets{nl}{no ligatures}{#1}% - \gdef\MT@nl@setname{no ligatures}% - } -}{ - \renewcommand*\DisableLigatures[1]{% - \MT@warning{Disabling ligatures of a font is only possible\MessageBreak - with pdftex version 1.30 or newer.\MessageBreak - Ignoring \string\DisableLigatures}% - \global\let\DisableLigatures\@gobble - } -} \renewcommand*\SetProtrusion[2][]{% \let\MT@pr@c@name\@undefined \let\MT@extra@context\@empty - \MT@map@clist@n{load,factor,unit,preset}{\MT@let@nc{MT@extra@##1}\@undefined}% + \MT@map@clist@n{load,factor,unit,preset,inputenc}{\MT@let@nc{MT@extra@##1}\@undefined}% \setkeys{MT@pr@c}{#1}% \MT@get@codes@name{pr}% - \MT@map@clist@n{factor,unit,preset}{\MT@set@opt{pr}{##1}}% + \MT@map@clist@n{factor,unit,preset,inputenc}{\MT@set@opt{pr}{##1}}% \def\MT@permutelist{pr@c}% \setkeys{MT@cfg}{#2}% \MT@permute @@ -1867,11 +1856,11 @@ time will almost certainly lead to undesired results. Have your choice!}% \renewcommand*\SetExpansion[2][]{% \let\MT@ex@c@name\@undefined \let\MT@extra@context\@empty - \MT@map@clist@n{load,factor,preset,stretch,shrink,step,auto}% + \MT@map@clist@n{load,factor,preset,inputenc,stretch,shrink,step,auto}% {\MT@let@nc{MT@extra@##1}\@undefined}% \setkeys{MT@ex@c}{#1}% \MT@get@codes@name{ex}% - \MT@map@clist@n{preset,stretch,shrink,step,auto}{\MT@set@opt{ex}{##1}}% + \MT@map@clist@n{preset,inputenc,stretch,shrink,step,auto}{\MT@set@opt{ex}{##1}}% \MT@ifdefined@c@T\MT@extra@factor{% \ifnum\MT@extra@factor>\@m \MT@warning@nl{Expansion factor \number\MT@extra@factor\space too @@ -1980,6 +1969,8 @@ time will almost certainly lead to undesired results. Have your choice!}% \MT@ifempty{##1}\relax{\def\MT@extra@preset{##1}}}% \define@key{MT@#1@c}{context}[]{% \MT@ifempty{##1}\relax{\def\MT@extra@context{##1}}}% + \define@key{MT@#1@c}{inputenc}{% + \MT@ifempty{##1}\relax{\def\MT@extra@inputenc{##1}}}% } \MT@map@clist@c\MT@features{\MT@declare@codes{#1}} \define@key{MT@pr@c}{unit}[character]{% @@ -2033,30 +2024,35 @@ time will almost certainly lead to undesired results. Have your choice!}% } \renewcommand*\DeclareCharacterInheritance[1][]{% \let\MT@extra@context\@empty - \KV@@sp@def\@tempa{#1}% + \let\MT@extra@inputenc\@undefined + \let\MT@inh@feat\@empty + \setkeys{MT@inh@}{#1}% \MT@begin@catcodes \MT@set@inh@list } \def\MT@set@inh@list#1#2{% - \MT@ifempty\@tempa{% + \MT@ifempty\MT@inh@feat{% \MT@map@clist@c\MT@features{{\MT@declare@char@inh{##1}{#1}{#2}}}% }{% - \MT@map@clist@c\@tempa{{% + \MT@map@clist@c\MT@inh@feat{{% \KV@@sp@def\@tempa{##1}% \MT@ifempty\@tempa\relax{% - \MT@is@feature{inheritance declaration for `#1'}{% - \MT@exp@one@n\MT@declare@char@inh - {\csname MT@rbba@\@tempa\endcsname}{#1}{#2}% - }% + \MT@exp@one@n\MT@declare@char@inh + {\csname MT@rbba@\@tempa\endcsname}{#1}{#2}% }% }}% }% \MT@end@catcodes } +\define@key{MT@inh@}{inputenc}{\def\MT@extra@inputenc{#1}} +\MT@map@clist@c\MT@features@long{% + \define@key{MT@inh@}{#1}[]{\edef\MT@inh@feat{\MT@inh@feat#1}}} \def\MT@declare@char@inh#1#2#3{% \MT@edef@n{MT@#1@inh@name}% {\MT@curr@file/\the\inputlineno (\@nameuse{MT@abbr@#1})}% \MT@let@cn\MT@curr@set@name{MT@#1@inh@name}% + \MT@ifdefined@c@T\MT@extra@inputenc{% + \global\MT@edef@n{MT@#1@inh@\MT@curr@set@name @inputenc}{\MT@extra@inputenc}}% \global\MT@def@n{MT@#1@inh@\csname MT@#1@inh@name\endcsname}{#3}% \def\MT@permutelist{#1@inh}% \setkeys{MT@inh}{#2}% @@ -2295,7 +2291,7 @@ time will almost certainly lead to undesired results. Have your choice!}% } \MT@define@option{protrusion} \MT@define@option{expansion} -\define@key{MT}{activate}[]{% +\define@key{MT}{activate}[true]{% \setkeys{MT}{protrusion={#1}}% \setkeys{MT}{expansion={#1}}% } @@ -2439,10 +2435,9 @@ time will almost certainly lead to undesired results. Have your choice!}% \MT@ifdefined@n@TF{MT@default@#1@set}\relax {\global\MT@def@n{MT@default@#1@set}{all}}% } -\MT@ifdefined@c@T\MicroType@Hook{% - \MT@warning{% - Command \string\MicroType@Hook\space is deprecated.\MessageBreak - Use \string\Microtype@Hook\space instead}\MicroType@Hook} +\MT@ifdefined@c@T\MicroType@Hook{\MT@warning{% + Command \string\MicroType@Hook\space is deprecated.\MessageBreak + Use \string\Microtype@Hook\space instead}\MicroType@Hook} \MT@ifdefined@c@T\Microtype@Hook\Microtype@Hook \def\microtypesetup{\setkeys{MT}} \MT@addto@setup{\def\microtypesetup{\setkeys{MTX}}} @@ -2506,15 +2501,14 @@ time will almost certainly lead to undesired results. Have your choice!}% } \MT@define@optionX{protrusion}\pdfprotrudechars \MT@define@optionX{expansion}\pdfadjustspacing -\define@key{MTX}{activate}[]{% +\define@key{MTX}{activate}[true]{% \setkeys{MTX}{protrusion={#1}}% \setkeys{MTX}{expansion={#1}}% } -\def\MT@gobblethree#1#2#3{} \let\MT@saved@setupfont\MT@setupfont \define@key{MTX}{disable}[]{% \MT@info{Inactivate `\MT@MT' package}% - \let\MT@setupfont\MT@gobblethree + \let\MT@setupfont\@gobble } \define@key{MTX}{enable}[]{% \MT@info{Reactivate `\MT@MT' package}% |