diff options
author | Karl Berry <karl@freefriends.org> | 2009-03-30 00:27:40 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-03-30 00:27:40 +0000 |
commit | 770b8dcff96fc77082253c0016943fd57f0c5255 (patch) | |
tree | 5e9b9ffd407f91b6c461f053c4760948c65a5de8 /Master/texmf-dist/tex/latex/microtype | |
parent | 9120aa788c52d7c88e08f833439129a3bf181a34 (diff) |
microtype update (29mar09)
git-svn-id: svn://tug.org/texlive/trunk@12566 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/microtype')
19 files changed, 236 insertions, 164 deletions
diff --git a/Master/texmf-dist/tex/latex/microtype/letterspace.sty b/Master/texmf-dist/tex/latex/microtype/letterspace.sty index 7a351e404a6..dfdc5056399 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 %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2008 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2009 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 @@ -32,9 +32,9 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage {letterspace} - [2008/11/11 v2.3c - Robust letterspacing (RS)% - ] + [2009/03/27 v2.3d + Robust letterspacing + (RS)] \def\MT@MT {letterspace} \let\MT@restore@catcodes\@empty @@ -68,6 +68,7 @@ \ifx\documentclass\@undefined \def\MT@plain{1} \def\hmode@bgroup{\leavevmode\bgroup} + \def\nfss@text#1{{\mbox{#1}}} \let\@typeset@protect\relax \ifx\eplain\@undefined \def\MT@plain{0} @@ -111,7 +112,8 @@ \ifcase\MT@pdftex@no don't seem to be using pdftex.\MessageBreak `\MT@MT' only works with pdftex.\MessageBreak - Try running `pdflatex' instead of `latex'% + Try running `pdflatex' instead of + `\ifx\XeTeXversion\@undefined\else xe\fi latex'% \else are using a pdftex version older than 1.40% @@ -122,20 +124,23 @@ } \MT@clear@options\MT@restore@catcodes \endinput\fi +\ifx\directlua\@undefined \else + \ifx\directlua\relax \else + \MT@warning@nl + {`\MT@MT' + doesn't currently work with luatex.% + \MessageBreak + Bye bye% + } + \MT@clear@options\MT@restore@catcodes + \expandafter\expandafter\expandafter\endinput + \fi +\fi \RequirePackage{keyval}[1997/11/10] \def\MT@tr@min{-\@m} \let\MT@tr@max\@m \let\MT@letterspace\m@ne \def\MT@letterspace@default{100} -\ifx\directlua\@undefined\else - \MT@warning@nl - {`\MT@MT' - doesn't currently work with luatex.% - \MessageBreak - Bye bye% - } - \MT@clear@options\MT@restore@catcodes\expandafter\endinput -\fi \def\MT@glet{\global\let} \def\MT@exp@cs#1#2{\expandafter#1\csname#2\endcsname} \def\MT@edef@n{\MT@exp@cs\edef} @@ -196,7 +201,6 @@ \MT@requires@latex1{ \let\MT@setup@\@empty \def\MT@addto@setup{\g@addto@macro\MT@setup@} -\AtBeginDocument{\MT@setup@ \MT@glet\MT@setup@\@empty} }{\let\MT@addto@setup\@firstofone} \def\MT@with@package@T#1{\@ifpackageloaded{#1}\@firstofone\@gobble} \MT@addto@setup{% @@ -222,7 +226,9 @@ \relax \def\MT@set@tr@codes{% \MT@ifdefined@c@TF\MT@letterspace@\relax{\let\MT@letterspace@\MT@letterspace}% - \ifnum\MT@letterspace@=\z@\else + \ifnum\MT@letterspace@=\z@ + \MT@set@tr@zero + \else \MT@warn@tracking@DVI \xdef\MT@lsfont{\csname\expandafter\string\font@name /\number\MT@letterspace@ ls\endcsname}% @@ -253,6 +259,7 @@ \MT@requires@latex2{ \def\MT@set@lsfont{\MT@exp@two@c\let\font@name\MT@lsfont} \DeclareRobustCommand\lsstyle{% + \not@math@alphabet\lsstyle\textls \let\MT@tracking\MT@set@tr@codes \selectfont } @@ -279,25 +286,43 @@ }{#1}}% } \def\MT@get@ls@basefont{% - \edef\MT@ls@basefont{\csname\expandafter\string\font@name @base\endcsname}% + \xdef\MT@ls@basefont{\csname\expandafter\string\font@name @base\endcsname}% \expandafter\ifx\MT@ls@basefont\relax \MT@exp@two@c\MT@glet\MT@ls@basefont\font@name \else \MT@exp@two@c\let\font@name\MT@ls@basefont \fi } +\def\MT@set@lsbasefont{\MT@exp@two@c\let\font@name\MT@ls@basefont} +\def\MT@set@tr@zero{% + \xdef\MT@ls@basefont{\csname\expandafter\string\font@name @base\endcsname}% + \expandafter\ifx\MT@ls@basefont\relax \else + \aftergroup\MT@set@lsbasefont + \fi +} \DeclareRobustCommand\textls{% - \hmode@bgroup - \@ifstar{\let\MT@ls@adjust\@empty\MT@textls}% - {\let\MT@ls@adjust\relax \MT@textls}% + \@ifstar{\let\MT@ls@adjust@\MT@ls@adjust@empty\MT@textls}% + {\let\MT@ls@adjust@\MT@ls@adjust@relax\MT@textls}% } \newcommand\MT@textls[2][]{% - \MT@ifempty{#1}% - {\let\MT@letterspace@\@undefined}% - {\KV@@sp@def\MT@letterspace@{#1}% - \MT@ls@too@large\MT@letterspace@}% - \lsstyle #2% - \egroup + \ifmmode + \nfss@text{\MT@ls@set@ls{#1}\lsstyle#2}% + \else + \hmode@bgroup + \MT@ls@set@ls{#1}% + \lsstyle #2% + \expandafter + \egroup + \fi +} +\def\MT@ls@adjust@empty{\let\MT@ls@adjust\@empty} +\def\MT@ls@adjust@relax{\let\MT@ls@adjust\relax} +\def\MT@ls@set@ls#1{% + \MT@ifempty{#1}% + {\let\MT@letterspace@\@undefined}% + {\KV@@sp@def\MT@letterspace@{#1}% + \MT@ls@too@large\MT@letterspace@}% + \MT@ls@adjust@ } \def\MT@ls@too@large#1{% \ifnum#1>\MT@tr@max @@ -418,6 +443,9 @@ \MT@ls@too@large\MT@letterspace \fi } +\MT@requires@latex1{ +\AtBeginDocument{\MT@setup@ \MT@glet\MT@setup@\@empty} +}\relax \MT@restore@catcodes \endinput %% diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.cfg b/Master/texmf-dist/tex/latex/microtype/microtype.cfg index 23aea689838..76a859bc1d7 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 %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2008 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2009 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 @@ -39,9 +39,9 @@ %% \ProvidesFile {microtype.cfg} - [2008/11/11 v2.3c - microtype main configuration file (RS)% - ] + [2009/03/27 v2.3d + microtype main configuration file + (RS)] %%% ----------------------------------------------------------------------- %%% FONT SETS diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.sty b/Master/texmf-dist/tex/latex/microtype/microtype.sty index a236b0af526..4909a437a97 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 %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2008 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2009 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 @@ -28,9 +28,9 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage {microtype} - [2008/11/11 v2.3c - Micro-typography with pdfTeX (RS)% - ] + [2009/03/27 v2.3d + Micro-typography with pdfTeX + (RS)] \def\MT@MT {microtype} \let\MT@restore@catcodes\@empty @@ -157,7 +157,8 @@ \ifcase\MT@pdftex@no don't seem to be using pdftex.\MessageBreak `\MT@MT' only works with pdftex.\MessageBreak - Try running `pdflatex' instead of `latex'% + Try running `pdflatex' instead of + `\ifx\XeTeXversion\@undefined\else xe\fi latex'% \else are using a pdftex version older than 0.14f% @@ -222,10 +223,19 @@ \def\MT@requires@pdftex#1{% \ifnum\MT@pdftex@no<#1 \expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi } -\def\MT@requires@luatex{% - \ifx\directlua\@undefined\expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi -} -\def\MT@lua{\directlua0} +\let\MT@requires@luatex\@secondoftwo +\ifx\directlua\@undefined \else + \ifx\directlua\relax \else + \let\MT@requires@luatex\@firstoftwo + \fi +\fi +\MT@requires@luatex{ +\ifnum\luatexversion<36 + \def\MT@lua{\directlua0} +\else + \def\MT@lua{\directlua} +\fi +}\relax \def\MT@glet{\global\let} \def\MT@exp@cs#1#2{\expandafter#1\csname#2\endcsname} \def\MT@exp@gcs#1#2{\begingroup\expandafter\endgroup\expandafter#1\csname#2\endcsname} @@ -541,7 +551,6 @@ \MT@clear@options\MT@restore@catcodes\endinput}\relax \let\MT@setup@\@empty \def\MT@addto@setup{\g@addto@macro\MT@setup@} -\AtBeginDocument{\MT@setup@ \MT@glet\MT@setup@\@empty} \def\MT@with@package@T#1{\@ifpackageloaded{#1}\@firstofone\@gobble} \def\MT@with@babel@and@T#1{% \MT@ifdefined@n@T{opt@babel.\@pkgextension}{% @@ -655,7 +664,7 @@ time will almost certainly lead to undesired results. Have your choice!}% } \MT@with@package@T{pinyin}{% \let\MT@orig@py@macron\py@macron - \@ifpackagelater{pinyin}{2006/10/17}{% 4.7.0 + \@ifpackagelater{pinyin}{2005/08/11}{% 4.6.0 \def\py@macron#1#2{% \let\pickup@font\MT@orig@pickupfont \MT@orig@py@macron{#1}{#2}% @@ -1358,7 +1367,9 @@ time will almost certainly lead to undesired results. Have your choice!}% \MT@get@tr@opt \relax \MT@ifdefined@c@TF\MT@letterspace@\relax{\let\MT@letterspace@\MT@letterspace}% - \ifnum\MT@letterspace@=\z@\else + \ifnum\MT@letterspace@=\z@ + \MT@set@tr@zero + \else \MT@vinfo{... Tracking by \number\MT@letterspace@}% \MT@warn@tracking@DVI \xdef\MT@lsfont{\csname\expandafter\string\font@name @@ -1431,6 +1442,7 @@ time will almost certainly lead to undesired results. Have your choice!}% } \def\MT@set@lsfont{\MT@exp@two@c\let\font@name\MT@lsfont} \DeclareRobustCommand\lsstyle{% + \not@math@alphabet\lsstyle\textls \def\MT@feat{tr}% \let\MT@tracking\MT@set@tr@codes \selectfont @@ -1446,13 +1458,20 @@ time will almost certainly lead to undesired results. Have your choice!}% }{#1}}% } \def\MT@get@ls@basefont{% - \edef\MT@ls@basefont{\csname\expandafter\string\font@name @base\endcsname}% + \xdef\MT@ls@basefont{\csname\expandafter\string\font@name @base\endcsname}% \expandafter\ifx\MT@ls@basefont\relax \MT@exp@two@c\MT@glet\MT@ls@basefont\font@name \else \MT@exp@two@c\let\font@name\MT@ls@basefont \fi } +\def\MT@set@lsbasefont{\MT@exp@two@c\let\font@name\MT@ls@basefont} +\def\MT@set@tr@zero{% + \xdef\MT@ls@basefont{\csname\expandafter\string\font@name @base\endcsname}% + \expandafter\ifx\MT@ls@basefont\relax \else + \aftergroup\MT@set@lsbasefont + \fi +} \MT@requires@pdftex7{ \def\MT@tr@noligatures{% \ifx\MT@tr@ligatures\@empty @@ -1541,34 +1560,38 @@ time will almost certainly lead to undesired results. Have your choice!}% \futurelet\MT@tr@outer@next\MT@tr@outer@r@ } \def\MT@tr@outer@r@{% - \def\MT@temp*##1{\ifhmode\hskip\MT@outer@space - \fi}% - \ifcat\egroup\noexpand\MT@tr@outer@next - \ifhmode\unkern\fi\egroup - \MT@set@curr@ok - \MT@set@curr@os - \def\MT@temp*{\afterassignment\MT@tr@outer@r\let\x=}% + \ifmmode + \def\MT@temp*{}% \else - \ifx\maybe@ic\MT@tr@outer@next - \def\MT@temp*{\afterassignment\MT@tr@outer@icr\let\x=}% - \else - \ifx\check@icr\MT@tr@outer@next - \def\MT@temp*{\aftergroup\MT@tr@outer@r\check@icr\let\x=}% + \ifnum\currentgrouptype=10 \else + \def\MT@temp*##1{\ifhmode\hskip\MT@outer@space + \fi}% + \ifcat\egroup\noexpand\MT@tr@outer@next + \ifhmode\unkern\fi\egroup + \MT@set@curr@ok + \MT@set@curr@os + \def\MT@temp*{\afterassignment\MT@tr@outer@r\let\MT@temp=}% \else - \ifx\@sptoken\MT@tr@outer@next - \def\MT@temp* {\ifhmode\hskip\MT@outer@space - \fi}% + \ifx\maybe@ic\MT@tr@outer@next + \def\MT@temp*{\afterassignment\MT@tr@outer@icr\let\MT@temp=}% \else - \ifx~\MT@tr@outer@next - \def\MT@temp*~{\nobreak\hskip\MT@outer@space - }% + \ifx\check@icr\MT@tr@outer@next + \def\MT@temp*{\aftergroup\MT@tr@outer@r\check@icr\let\MT@temp=}% \else - \ifx\ \MT@tr@outer@next \else - \ifx\space\MT@tr@outer@next \else - \ifx\@xobeysp\MT@tr@outer@next \else - \def\MT@temp*{\ifdim\MT@outer@kern=\z@\else\MT@ls@outer@k\fi}% - \let\MT@tr@outer@next\relax - \fi\fi\fi\fi\fi\fi\fi\fi + \ifx\@sptoken\MT@tr@outer@next + \def\MT@temp* {\ifhmode\hskip\MT@outer@space + \fi}% + \else + \ifx~\MT@tr@outer@next + \def\MT@temp*~{\nobreak\hskip\MT@outer@space + }% + \else + \ifx\ \MT@tr@outer@next \else + \ifx\space\MT@tr@outer@next \else + \ifx\@xobeysp\MT@tr@outer@next \else + \def\MT@temp*{\ifdim\MT@outer@kern=\z@\else\MT@ls@outer@k\fi}% + \let\MT@tr@outer@next\relax + \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi \MT@temp*% } \def\MT@tr@outer@icr{\afterassignment\MT@tr@outer@icr@\MT@tr@outer@r} @@ -1583,18 +1606,36 @@ time will almost certainly lead to undesired results. Have your choice!}% \MT@glet\lsstyle\relax } } +\MT@requires@luatex{ + \DeclareRobustCommand\lsstyle{% + \MT@error{Letterspacing currently doesn't work with luatex} + {Run pdftex, or use the `soul' package instead.}% + \MT@glet\lsstyle\relax + } +}\relax \DeclareRobustCommand\textls{% - \hmode@bgroup - \@ifstar{\let\MT@ls@adjust\@empty\MT@textls}% - {\let\MT@ls@adjust\relax \MT@textls}% + \@ifstar{\let\MT@ls@adjust@\MT@ls@adjust@empty\MT@textls}% + {\let\MT@ls@adjust@\MT@ls@adjust@relax\MT@textls}% } \newcommand\MT@textls[2][]{% - \MT@ifempty{#1}% - {\let\MT@letterspace@\@undefined}% - {\KV@@sp@def\MT@letterspace@{#1}% - \MT@ls@too@large\MT@letterspace@}% - \lsstyle #2% - \egroup + \ifmmode + \nfss@text{\MT@ls@set@ls{#1}\lsstyle#2}% + \else + \hmode@bgroup + \MT@ls@set@ls{#1}% + \lsstyle #2% + \expandafter + \egroup + \fi +} +\def\MT@ls@adjust@empty{\let\MT@ls@adjust\@empty} +\def\MT@ls@adjust@relax{\let\MT@ls@adjust\relax} +\def\MT@ls@set@ls#1{% + \MT@ifempty{#1}% + {\let\MT@letterspace@\@undefined}% + {\KV@@sp@def\MT@letterspace@{#1}% + \MT@ls@too@large\MT@letterspace@}% + \MT@ls@adjust@ } \def\MT@ls@too@large#1{% \ifnum#1>\MT@tr@max @@ -1610,8 +1651,8 @@ time will almost certainly lead to undesired results. Have your choice!}% \newdimen\MT@outer@kern \def\MT@tr@set@okern#1,#2,{% \let\MT@temp\@empty - \MT@tr@set@okern@{#1}% - \MT@tr@set@okern@{#2}% + \MT@ifempty{#1}{\MT@tr@set@okern@{*}}{\MT@tr@set@okern@{#1}}% + \MT@ifempty{#2}{\MT@tr@set@okern@{*}}{\MT@tr@set@okern@{#2}}% \MT@glet@nc{MT@outer@kern\expandafter\string\font@name}\MT@temp } \def\MT@tr@set@okern@#1{% @@ -2353,11 +2394,11 @@ time will almost certainly lead to undesired results. Have your choice!}% } \MT@exp@one@n\MT@map@clist@n{\MT@features,nl}{% \MT@define@set@key@{encoding}{#1}% - \MT@define@set@key@{family}{#1}% - \MT@define@set@key@{series}{#1}% - \MT@define@set@key@{shape}{#1}% - \MT@define@set@key@size{#1}% - \MT@define@set@key@font{#1}% + \MT@define@set@key@{family} {#1}% + \MT@define@set@key@{series} {#1}% + \MT@define@set@key@{shape} {#1}% + \MT@define@set@key@size {#1}% + \MT@define@set@key@font {#1}% } \renewcommand*\UseMicrotypeSet[2][]{% \KV@@sp@def\@tempa{#1}% @@ -2614,11 +2655,11 @@ time will almost certainly lead to undesired results. Have your choice!}% \MT@get@font@{#1}{#2}{#3}{#4}{#5}{1}% } \MT@define@code@key{encoding}{cfg} -\MT@define@code@key{family}{cfg} -\MT@define@code@key{series}{cfg} -\MT@define@code@key{shape}{cfg} -\MT@define@code@key@size{cfg} -\MT@define@code@key@font{cfg} +\MT@define@code@key{family} {cfg} +\MT@define@code@key{series} {cfg} +\MT@define@code@key{shape} {cfg} +\MT@define@code@key@size {cfg} +\MT@define@code@key@font {cfg} \def\MT@define@opt@key#1#2{% \define@key{MT@#1@c}{#2}[]{\MT@ifempty{##1}\relax{% \MT@xdef@n{MT@#1@c@\MT@curr@set@name @#2}{##1}}}% @@ -2811,9 +2852,9 @@ time will almost certainly lead to undesired results. Have your choice!}% } \MT@define@code@key{family}{inh} \MT@define@code@key{series}{inh} -\MT@define@code@key{shape}{inh} -\MT@define@code@key@size{inh} -\MT@define@code@key@font{inh} +\MT@define@code@key{shape} {inh} +\MT@define@code@key@size {inh} +\MT@define@code@key@font {inh} \def\MT@inh@do#1,{% \ifx\relax#1\@empty \else \MT@inh@split #1==\relax @@ -3185,16 +3226,18 @@ time will almost certainly lead to undesired results. Have your choice!}% This will almost certainly cause undesired results.\MessageBreak Please fix your installation}% } -\MT@map@clist@c\MT@features{% - \MT@ifdefined@n@TF{MT@default@#1@set}\relax - {\MT@gdef@n{MT@default@#1@set}{all}}% -} \def\MT@check@active@set#1{% \MT@ifdefined@n@TF{MT@#1@setname}{% \MT@info@nl{Using \@nameuse{MT@abbr@#1} set `\@nameuse{MT@#1@setname}'}% }{% - \MT@glet@nn{MT@#1@setname}{MT@default@#1@set}% - \MT@info@nl{Using default \@nameuse{MT@abbr@#1} set `\@nameuse{MT@#1@setname}'}% + \MT@ifdefined@n@TF{MT@default@#1@set}{% + \MT@glet@nn{MT@#1@setname}{MT@default@#1@set}% + \MT@info@nl{Using default \@nameuse{MT@abbr@#1} set `\@nameuse{MT@#1@setname}'}% + }{% + \MT@gdef@n{MT@#1@setname}{@}% + \MT@warning@nl{No \@nameuse{MT@abbr@#1} set chosen, no default set declared. + \MessageBreak Using empty set}% + }% }% } \MT@ifdefined@c@T\MicroType@Hook{\MT@warning{% @@ -3202,7 +3245,7 @@ time will almost certainly lead to undesired results. Have your choice!}% 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}}} +\MT@addto@setup{\def\microtypesetup#1{\setkeys{MTX}{#1}\selectfont}} \def\MT@define@optionX#1#2{% \define@key{MTX}{#1}[true]{% \edef\@tempb{\csname MT@rbba@#1\endcsname}% @@ -3213,26 +3256,26 @@ time will almost certainly lead to undesired results. Have your choice!}% \MT@ifstreq\MT@val{true}{% \MT@checksetup{#1}{% \@tempcnta=\csname MT@\@tempb @level\endcsname - \MT@info{Enabling #1 - (level \number\csname MT@\@tempb @level\endcsname)}% + \MT@vinfo{Enabling #1 + (level \number\csname MT@\@tempb @level\endcsname)\on@line}% }% }{% \MT@ifstreq\MT@val{false}{% \@tempcnta=\z@ - \MT@info{Disabling #1}% + \MT@vinfo{Disabling #1\on@line}% }{% \MT@ifstreq\MT@val{compatibility}{% \MT@checksetup{#1}{% \@tempcnta=\@ne \MT@let@nc{MT@\@tempb @level}\@ne - \MT@info{Setting #1 to level 1}% + \MT@vinfo{Setting #1 to level 1\on@line}% }% }{% \MT@ifstreq\MT@val{nocompatibility}{% \MT@checksetup{#1}{% \@tempcnta=\tw@ \MT@let@nc{MT@\@tempb @level}\tw@ - \MT@info{Setting #1 to level 2}% + \MT@vinfo{Setting #1 to level 2\on@line}% }% }{\MT@error{Value `\MT@val' for key `#1' not recognised} {Use any of `true', `false', `compatibility' or @@ -3270,12 +3313,12 @@ time will almost certainly lead to undesired results. Have your choice!}% \MT@ifstreq\MT@val{true}{% \MT@checksetup{#1}{% \@tempcnta=\@ne - \MT@info{Enabling #1}% + \MT@vinfo{Enabling #1\on@line}% }% }{% \MT@ifstreq\MT@val{false}{% \@tempcnta=\z@ - \MT@info{Disabling #1}% + \MT@vinfo{Disabling #1\on@line}% }{\MT@error{Value `\MT@val' for key `#1' not recognised} {Use either `true' or `false'}% }% @@ -3287,8 +3330,8 @@ time will almost certainly lead to undesired results. Have your choice!}% }% }% } - \MT@define@optionX@{tracking}{\ifnum\@tempcnta=\z@ \let\MT@tracking\relax - \else\let\MT@tracking\MT@tracking@\fi} + \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} @@ -3348,6 +3391,7 @@ time will almost certainly lead to undesired results. Have your choice!}% \fi \MT@info@nl{Generating \ifnum\pdfoutput<\@ne DVI \else PDF \fi output% \ifMT@opt@DVI\space (changed by \MT@MT)\fi}% + \ifx\MT@copy@font\relax\else \MT@info@nl{Using font copies for contexts}\fi \MT@map@tlist@c\MT@font@sets\MT@fix@font@set \ifMT@protrusion \edef\MT@active@features{\MT@active@features,pr} @@ -3368,30 +3412,31 @@ time will almost certainly lead to undesired results. Have your choice!}% \ifnum\MT@shrink=\m@ne \let\MT@shrink\MT@stretch \fi - \ifnum\MT@step=\m@ne - \ifnum\MT@stretch>\MT@shrink - \ifnum\MT@shrink=\z@ - \@tempcnta=\MT@stretch + \MT@requires@pdftex6{\def\MT@step{1 }}{ + \ifnum\MT@step=\m@ne + \ifnum\MT@stretch>\MT@shrink + \ifnum\MT@shrink=\z@ + \@tempcnta=\MT@stretch + \else + \@tempcnta=\MT@shrink + \fi \else - \@tempcnta=\MT@shrink + \ifnum\MT@stretch=\z@ + \@tempcnta=\MT@shrink + \else + \@tempcnta=\MT@stretch + \fi \fi + \divide\@tempcnta 5\relax \else - \ifnum\MT@stretch=\z@ - \@tempcnta=\MT@shrink - \else - \@tempcnta=\MT@stretch + \@tempcnta=\MT@step + \ifnum\@tempcnta=\z@ + \MT@warning@nl{The expansion step cannot be set to zero.\MessageBreak + Setting it to one} \fi \fi - \divide\@tempcnta 5\relax - \else - \@tempcnta=\MT@step - \ifnum\@tempcnta=\z@ - \MT@warning@nl{The expansion step cannot be set to zero.\MessageBreak - Setting it to one} - \fi - \fi - \ifnum\@tempcnta=\z@ \@tempcnta=\@ne \fi - \edef\MT@step{\number\@tempcnta\space} + \ifnum\@tempcnta=\z@ \@tempcnta=\@ne \fi + \edef\MT@step{\number\@tempcnta\space}} \let\MT@auto\@empty \ifMT@auto \MT@requires@pdftex4{% @@ -3443,9 +3488,7 @@ time will almost certainly lead to undesired results. Have your choice!}% \MT@info@nl{\ifMT@auto A\else Non-a\fi utomatic font expansion enabled (level \number\MT@ex@level),\MessageBreak stretch: \number\MT@stretch, shrink: \number\MT@shrink, - step: \number\MT@step, \ifMT@selected\else non-\fi selected% - \ifx\MT@copy@font\relax\else .\MessageBreak - Using font copies for contexts\fi} + step: \number\MT@step, \ifMT@selected\else non-\fi selected} \def\MT@check@step#1{% \@tempcnta=\csname MT@#1\endcsname \divide\@tempcnta \MT@step @@ -3556,23 +3599,6 @@ time will almost certainly lead to undesired results. Have your choice!}% \fi } } -\MT@requires@pdftex6{ - \AtBeginDocument{% - \ifMT@spacing - \ifMT@babel \else - \ifnum\sfcode`\. > 1500 - \MT@ifstreq\MT@sp@context{nonfrench}\relax{% - \MT@warning@nl{% - \string\nonfrenchspacing\space is active. Adjustment of\MessageBreak - interword spacing will disable it. You might want\MessageBreak - to add `\@backslashchar\MT@MT context{spacing=nonfrench}'\MessageBreak - to your preamble}% - }% - \fi - \fi - \fi - } -}\relax \MT@requires@pdftex5{ \MT@addto@setup{% \ifMT@noligatures \else @@ -3638,9 +3664,27 @@ time will almost certainly lead to undesired results. Have your choice!}% } \fi } -\MT@addto@setup\fi -\AtBeginDocument\selectfont +\MT@addto@setup{\fi + \selectfont} \edef\MT@curr@file{\jobname.tex} +\AtBeginDocument{\MT@setup@ \MT@glet\MT@setup@\@empty} +\MT@requires@pdftex6{ + \AtBeginDocument{% + \ifMT@spacing + \ifMT@babel \else + \ifnum\sfcode`\. > 1500 + \MT@ifstreq\MT@sp@context{nonfrench}\relax{% + \MT@warning@nl{% + \string\nonfrenchspacing\space is active. Adjustment of\MessageBreak + interword spacing will disable it. You might want\MessageBreak + to add `\@backslashchar\MT@MT context{spacing=nonfrench}'\MessageBreak + to your preamble}% + }% + \fi + \fi + \fi + } +}\relax \MT@restore@catcodes \endinput %% diff --git a/Master/texmf-dist/tex/latex/microtype/mt-bch.cfg b/Master/texmf-dist/tex/latex/microtype/mt-bch.cfg index 11bbdfb76a8..6cb13373a41 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 %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2008 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2009 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 diff --git a/Master/texmf-dist/tex/latex/microtype/mt-blg.cfg b/Master/texmf-dist/tex/latex/microtype/mt-blg.cfg index 2173664b252..efae38cd00e 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 %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2008 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2009 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 diff --git a/Master/texmf-dist/tex/latex/microtype/mt-cmr.cfg b/Master/texmf-dist/tex/latex/microtype/mt-cmr.cfg index 84d04c746b1..4bac2ddabeb 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 %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2008 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2009 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 diff --git a/Master/texmf-dist/tex/latex/microtype/mt-euf.cfg b/Master/texmf-dist/tex/latex/microtype/mt-euf.cfg index d77d1e824ee..0a6ccad86dc 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 %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2008 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2009 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 diff --git a/Master/texmf-dist/tex/latex/microtype/mt-eur.cfg b/Master/texmf-dist/tex/latex/microtype/mt-eur.cfg index c4a0bbc5ca4..f83e322626c 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 %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2008 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2009 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 diff --git a/Master/texmf-dist/tex/latex/microtype/mt-euroitc.cfg b/Master/texmf-dist/tex/latex/microtype/mt-euroitc.cfg index f8fc054b03f..dd11662dffd 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 %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2008 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2009 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 diff --git a/Master/texmf-dist/tex/latex/microtype/mt-eus.cfg b/Master/texmf-dist/tex/latex/microtype/mt-eus.cfg index 56e6270c53b..53c06abe3fc 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 %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2008 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2009 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 diff --git a/Master/texmf-dist/tex/latex/microtype/mt-msa.cfg b/Master/texmf-dist/tex/latex/microtype/mt-msa.cfg index c28404be02f..1c969249352 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 %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2008 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2009 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 diff --git a/Master/texmf-dist/tex/latex/microtype/mt-msb.cfg b/Master/texmf-dist/tex/latex/microtype/mt-msb.cfg index 406355b33e2..926088d4aaf 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 %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2008 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2009 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 diff --git a/Master/texmf-dist/tex/latex/microtype/mt-mvs.cfg b/Master/texmf-dist/tex/latex/microtype/mt-mvs.cfg index dd7496d0fb5..6e5eef64041 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 %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2008 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2009 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 diff --git a/Master/texmf-dist/tex/latex/microtype/mt-pad.cfg b/Master/texmf-dist/tex/latex/microtype/mt-pad.cfg index df3ca494a07..4b4763ee154 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 %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2008 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2009 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 diff --git a/Master/texmf-dist/tex/latex/microtype/mt-pmn.cfg b/Master/texmf-dist/tex/latex/microtype/mt-pmn.cfg index b1878d5e022..f39225a9ec7 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 %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2008 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2009 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 diff --git a/Master/texmf-dist/tex/latex/microtype/mt-ppl.cfg b/Master/texmf-dist/tex/latex/microtype/mt-ppl.cfg index 23bbf9dc6a3..7f2f2b6f8fb 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 %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2008 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2009 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 diff --git a/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg b/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg index d752dd5755a..5f573ace26a 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 %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2008 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2009 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 diff --git a/Master/texmf-dist/tex/latex/microtype/mt-ugm.cfg b/Master/texmf-dist/tex/latex/microtype/mt-ugm.cfg index 37eccd885fd..d41fed9ff9b 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 %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2008 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2009 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 diff --git a/Master/texmf-dist/tex/latex/microtype/mt-zpeu.cfg b/Master/texmf-dist/tex/latex/microtype/mt-zpeu.cfg index 43b5a04b6e6..9150baf9181 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 %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2008 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2009 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 |