diff options
author | Karl Berry <karl@freefriends.org> | 2008-03-01 23:20:56 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2008-03-01 23:20:56 +0000 |
commit | 2aae6e259727499d0adc0e0a7193b188a45ddb0e (patch) | |
tree | 3cfccaf897a394c270400a87a1d75dc3ce54f18f /Master/texmf-dist/tex/latex | |
parent | cd59e77a5d3e29f608044c68e994c78dc56e1367 (diff) |
microtype update (29feb08)
git-svn-id: svn://tug.org/texlive/trunk@6791 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
19 files changed, 359 insertions, 373 deletions
diff --git a/Master/texmf-dist/tex/latex/microtype/letterspace.sty b/Master/texmf-dist/tex/latex/microtype/letterspace.sty index d26ce3541ff..5256e48c772 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--2007 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2008 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 @@ -31,9 +31,33 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage - {letterspace}[2007/12/23 v1.3 Robust letterspacing (RS)] + {letterspace} + [2008/02/29 v2.3a + Robust letterspacing (RS)% + ] \def\MT@MT {letterspace} +\let\MT@restore@catcodes\@empty +\def\MT@fix@catcode#1#2{% + \edef\MT@restore@catcodes{% + \MT@restore@catcodes + \catcode#1 \the\catcode#1\relax + }% + \catcode#1 #2\relax +} +\MT@fix@catcode{24} {9}% ^^X (ignore) +\MT@fix@catcode{36} {3}% $ (math shift) +\MT@fix@catcode{39}{12}% ' +\MT@fix@catcode{42}{12}% * +\MT@fix@catcode{43}{12}% + +\MT@fix@catcode{44}{12}% , +\MT@fix@catcode{45}{12}% - +\MT@fix@catcode{58}{12}% : +\MT@fix@catcode{60}{12}% < +\MT@fix@catcode{61}{12}% = +\MT@fix@catcode{62}{12}% > +\MT@fix@catcode{94} {7}% ^ (superscript) +\MT@fix@catcode{96}{12}% ` \newcommand*\lsstyle{} \newcommand\textls[2][]{} \def\textls#1#{} @@ -80,7 +104,6 @@ } \ifnum\MT@pdftex@no < 6 - \MT@clear@options \MT@warning@nl{You \ifcase\MT@pdftex@no don't seem to be using pdftex.\MessageBreak @@ -94,6 +117,7 @@ Please install a newer version of pdftex% \fi } + \MT@clear@options\MT@restore@catcodes \endinput\fi \RequirePackage{keyval}[1997/11/10] \def\MT@tr@min{-\@m} @@ -103,22 +127,22 @@ \ifx\directlua\@undefined\else \MT@warning@nl {`\MT@MT' - doesn't currently work with luatex.\MessageBreak Bye bye% + doesn't currently work with luatex.% + \MessageBreak + Bye bye% } - \MT@clear@options\expandafter\endinput + \MT@clear@options\MT@restore@catcodes\expandafter\endinput \fi \def\MT@glet{\global\let} \def\MT@edef@n#1{\expandafter\edef\csname #1\endcsname} \def\MT@exp@one@n#1#2{\expandafter#1\expandafter{#2}} \def\MT@exp@two@c#1{\expandafter\expandafter\expandafter#1\expandafter} -\catcode`\X=9 - \def\MT@ifdefined@c@TF#1{% -X \ifdefined#1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi - } - \def\MT@ifdefined@n@T#1{% -X \ifcsname#1\endcsname\expandafter\@firstofone\else\expandafter\@gobble\fi - } -\catcode`\X=11 +\def\MT@ifdefined@c@TF#1{% +^^X \ifdefined#1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi +} +\def\MT@ifdefined@n@T#1{% +^^X \ifcsname#1\endcsname\expandafter\@firstofone\else\expandafter\@gobble\fi +} \begingroup \catcode`\%=12 \catcode`\&=14 @@ -169,23 +193,29 @@ X \ifcsname#1\endcsname\expandafter\@firstofone\else\expandafter\@gobble\fi \let\MT@setup@\@empty \def\MT@addto@setup{\g@addto@macro\MT@setup@} \AtBeginDocument{\MT@setup@ \MT@glet\MT@setup@\@empty} +\else \let\MT@addto@setup\@firstofone \fi \def\MT@with@package@T#1{\@ifpackageloaded{#1}\@firstofone\@gobble} \MT@addto@setup{% - \MT@with@package@T - {hyperref}{% + \ifnum\MT@plain=0 + \MT@with@package@T{hyperref}{% \pdfstringdefDisableCommands{% \def\lsstyle{\pdfstringdefWarn\lsstyle}% \def\textls#1#{\pdfstringdefWarn\textls}% }% } + \fi + \ifnum\MT@plain=0 \MT@with@package@T{soul}{% \soulregister\lsstyle 0% \soulregister\textls 1% } + \else + \ifx\SOUL@\@undefined\else + \soulregister\lsstyle 0% + \soulregister\textls 1% + \fi + \fi } -\else - \let\MT@addto@setup\@firstofone -\fi \let\MT@tracking\relax \def\MT@set@tr@codes{% \MT@ifdefined@c@TF\MT@letterspace@\relax{\let\MT@letterspace@\MT@letterspace}% @@ -222,7 +252,7 @@ X \ifcsname#1\endcsname\expandafter\@firstofone\else\expandafter\@gobble\fi } \else \def\MT@set@lsfont{\MT@lsfont} -\renewcommand\lsstyle{% +\def\lsstyle{% \begingroup \escapechar\m@ne \xdef\font@name{\csname\expandafter\string\the\font\endcsname}% @@ -305,10 +335,13 @@ X \ifcsname#1\endcsname\expandafter\@firstofone\else\expandafter\@gobble\fi } } \fi +\ifnum\MT@plain<2 \def\MT@optwarn@nan#1#2{% - \MT@warning@nl{Value `#1' for option `#2' is not a\MessageBreak number. - Using default value of \number\@nameuse{MT@#2@default}}% + \MT@warning@nl{Value `#1' for option `#2' is not a\MessageBreak number. + Using default value of \number\@nameuse{MT@#2@default}}% } +\fi +\ifnum\MT@plain<2 \MT@map@clist@n{% letterspace}{% \define@key{MT}{#1}[\csname MT@#1@default\endcsname]{% @@ -318,21 +351,22 @@ X \ifcsname#1\endcsname\expandafter\@firstofone\else\expandafter\@gobble\fi {\MT@optwarn@nan{##1}{#1}}% }% } +\fi \ifnum\MT@plain<2 \def\MT@ProcessOptionsWithKV#1{% \let\@tempc\relax \let\MT@temp\@empty \ifnum\MT@plain=0 - \MT@map@clist@c\@classoptionslist{% - \def\CurrentOption{##1}% - \MT@ifdefined@n@T{KV@#1@\CurrentOption}{% - \edef\MT@temp{\MT@temp,\CurrentOption,}% - \@expandtwoargs\@removeelement\CurrentOption - \@unusedoptionlist\@unusedoptionlist + \MT@map@clist@c\@classoptionslist{% + \def\CurrentOption{##1}% + \MT@ifdefined@n@T{KV@#1@\expandafter\MT@getkey\CurrentOption=\@nil}{% + \edef\MT@temp{\MT@temp,\CurrentOption,}% + \@expandtwoargs\@removeelement\CurrentOption + \@unusedoptionlist\@unusedoptionlist + }% }% - }% - \edef\MT@temp{\noexpand\setkeys{#1}% - {\MT@temp\@ptionlist{\@currname.\@currext}}}% + \edef\MT@temp{\noexpand\setkeys{#1}% + {\MT@temp\@ptionlist{\@currname.\@currext}}}% \else \edef\MT@temp{\noexpand\setkeys{#1}% {\csname usepkg@options@\usepkg@pkg\endcsname}}% @@ -340,6 +374,7 @@ X \ifcsname#1\endcsname\expandafter\@firstofone\else\expandafter\@gobble\fi \MT@temp \MT@clear@options } +\def\MT@getkey#1=#2\@nil{#1} \MT@ProcessOptionsWithKV{MT} \fi \MT@addto@setup{% @@ -364,6 +399,7 @@ X \ifcsname#1\endcsname\expandafter\@firstofone\else\expandafter\@gobble\fi \MT@ls@too@large\MT@letterspace \fi } +\MT@restore@catcodes \endinput %% %% End of file `letterspace.sty'. diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.cfg b/Master/texmf-dist/tex/latex/microtype/microtype.cfg index 66c4a509069..5c2a9d8cf48 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--2007 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2008 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 @@ -38,7 +38,10 @@ %% ------------------------------------------------------------------------ %% \ProvidesFile - {microtype.cfg}[2007/12/23 v2.3 microtype main configuration file (RS)] + {microtype.cfg} + [2008/02/29 v2.3a + microtype main configuration file (RS)% + ] %%% ----------------------------------------------------------------------- %%% FONT SETS @@ -123,14 +126,14 @@ %%% INTERACTION WITH THE `babel' PACKAGE \DeclareMicrotypeBabelHook - {french,francais,acadian,canadien} - {kerning=french, spacing=} - -\DeclareMicrotypeBabelHook {english,UKenglish,british,USenglish,american} {kerning=, spacing=nonfrench} \DeclareMicrotypeBabelHook + {french,francais,acadian,canadien} + {kerning=french, spacing=} + +\DeclareMicrotypeBabelHook {turkish} {kerning=turkish, spacing=} diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.sty b/Master/texmf-dist/tex/latex/microtype/microtype.sty index a6b56d69dda..372ecc4adf2 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--2007 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2008 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,37 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage {microtype} - [2007/12/23 v2.3 Micro-typography with pdfTeX (RS)] + [2008/02/29 v2.3a + Micro-typography with pdfTeX (RS)% + ] \def\MT@MT {microtype} +\let\MT@restore@catcodes\@empty +\def\MT@fix@catcode#1#2{% + \edef\MT@restore@catcodes{% + \MT@restore@catcodes + \catcode#1 \the\catcode#1\relax + }% + \catcode#1 #2\relax +} +\MT@fix@catcode{17}{14}% ^^Q (comment) +\MT@fix@catcode{24} {9}% ^^X (ignore) +\MT@fix@catcode{33}{12}% ! +\MT@fix@catcode{34}{12}% " +\MT@fix@catcode{36} {3}% $ (math shift) +\MT@fix@catcode{39}{12}% ' +\MT@fix@catcode{42}{12}% * +\MT@fix@catcode{43}{12}% + +\MT@fix@catcode{44}{12}% , +\MT@fix@catcode{45}{12}% - +\MT@fix@catcode{58}{12}% : +\MT@fix@catcode{60}{12}% < +\MT@fix@catcode{61}{12}% = +\MT@fix@catcode{62}{12}% > +\MT@fix@catcode{63}{12}% ? +\MT@fix@catcode{94} {7}% ^ (superscript) +\MT@fix@catcode{96}{12}% ` +\MT@fix@catcode{124}{12}% | \newcommand*\DeclareMicrotypeSet[3][]{} \newcommand*\UseMicrotypeSet[2][]{} \newcommand*\DeclareMicrotypeSetDefault[2][]{} @@ -125,7 +153,6 @@ } \ifnum\MT@pdftex@no < 2 - \MT@clear@options \MT@warning@nl{You \ifcase\MT@pdftex@no don't seem to be using pdftex.\MessageBreak @@ -139,29 +166,8 @@ Please install a newer version of pdftex% \fi } + \MT@clear@options\MT@restore@catcodes \endinput\fi -\def\MT@catcodes{% - \catcode`\^7 % - \@makeother\-% - \@makeother\=% - \@makeother\*% - \@makeother\+% - \@makeother\,% - \@makeother\/% - \@makeother\`% - \@makeother\'% - \@makeother\"% - \@makeother\!% -} -\def\MT@restore@catcodes#1{% - \ifx\relax#1\else - \noexpand\catcode`\noexpand#1\the\catcode`#1\relax - \expandafter\MT@restore@catcodes - \fi -} -\edef\MT@restore@catcodes{\MT@restore@catcodes\^\-\=\*\+\,\/\`\'\"\!\relax} -\MT@catcodes -\AtEndOfPackage{\MT@restore@catcodes} \RequirePackage{keyval}[1997/11/10] \newtoks\MT@toks \newif\ifMT@if@ @@ -204,29 +210,23 @@ \let\MT@letterspace\m@ne \def\MT@letterspace@default{100} \newif\ifMT@document -\def\MT@maybe@etex{% - \ifcase 0% - \ifx\eTeXversion\@undefined 1\else - \ifx\eTeXversion\relax 1\else - \ifcase\eTeXversion 1\fi - \fi +\ifcase 0% + \ifx\eTeXversion\@undefined 1\else + \ifx\eTeXversion\relax 1\else + \ifcase\eTeXversion 1\fi \fi - \catcode`Q=14 \catcode`X=9 - \else - \catcode`Q=9 \catcode`X=14 \fi - \MT@maybe@etex@ -} -\def\MT@maybe@etex@#1{#1% - \catcode`Q=11 \catcode`X=11 -} +\else + \catcode`\^^Q=9 \catcode`\^^X=14 +\fi \def\MT@requires@pdftex#1{% \ifnum\MT@pdftex@no<#1 \expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi } \ifx\directlua\@undefined\else \MT@error {`\MT@MT' - only works with luatex if you generate\MessageBreak + only works with luatex if you generate% + \MessageBreak the package with the `lua' option% } {} @@ -246,37 +246,33 @@ \expandafter\expandafter\expandafter #1\expandafter\expandafter\expandafter {\expandafter#2\expandafter}\expandafter{#3}} -\MT@maybe@etex{ - \def\MT@ifdefined@c@T#1{% -X \ifdefined#1\expandafter\@firstofone\else\expandafter\@gobble\fi -Q \ifx#1\@undefined\expandafter\@gobble\else\expandafter\@firstofone\fi - } - \def\MT@ifdefined@c@TF#1{% -X \ifdefined#1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi -Q \ifx#1\@undefined -Q \expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi - } - \def\MT@ifdefined@n@T#1{% -X \ifcsname#1\endcsname\expandafter\@firstofone\else\expandafter\@gobble\fi -Q \begingroup\MT@exp@two@c\endgroup\ifx\csname #1\endcsname\relax -Q \expandafter\@gobble\else\expandafter\@firstofone\fi - } - \def\MT@ifdefined@n@TF#1{% -X \ifcsname#1\endcsname\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi -Q \begingroup\MT@exp@two@c\endgroup\ifx\csname #1\endcsname\relax -Q \expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi - } -} -\MT@maybe@etex{ - \def\MT@detokenize@n#1{% -X \detokenize\expandafter{% - \string#1% -X }% - } - \def\MT@detokenize@c#1{% -X \detokenize\expandafter\expandafter\expandafter{\expandafter\string#1}% -Q \MT@exp@two@c\zap@space\strip@prefix\meaning#1 \@empty - } +\def\MT@ifdefined@c@T#1{% +^^X \ifdefined#1\expandafter\@firstofone\else\expandafter\@gobble\fi +^^Q \ifx#1\@undefined\expandafter\@gobble\else\expandafter\@firstofone\fi +} +\def\MT@ifdefined@c@TF#1{% +^^X \ifdefined#1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi +^^Q \ifx#1\@undefined +^^Q \expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi +} +\def\MT@ifdefined@n@T#1{% +^^X \ifcsname#1\endcsname\expandafter\@firstofone\else\expandafter\@gobble\fi +^^Q \begingroup\MT@exp@two@c\endgroup\ifx\csname #1\endcsname\relax +^^Q \expandafter\@gobble\else\expandafter\@firstofone\fi +} +\def\MT@ifdefined@n@TF#1{% +^^X \ifcsname#1\endcsname\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi +^^Q \begingroup\MT@exp@two@c\endgroup\ifx\csname #1\endcsname\relax +^^Q \expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi +} +\def\MT@detokenize@n#1{% +^^X \detokenize\expandafter{% + \string#1% +^^X }% +} +\def\MT@detokenize@c#1{% +^^X \detokenize\expandafter\expandafter\expandafter{\expandafter\string#1}% +^^Q \MT@exp@two@c\zap@space\strip@prefix\meaning#1 \@empty } \begingroup \catcode`\%=12 @@ -456,22 +452,20 @@ Q \MT@exp@two@c\zap@space\strip@prefix\meaning#1 \@empty } \def\MT@do@font{\MT@while@num\z@\@cclvi} \newcount\MT@count -\MT@maybe@etex{ - \def\MT@increment#1{% -X \edef#1{\number\numexpr #1 + 1\relax}% -Q \MT@count=#1\relax -Q \advance\MT@count \@ne -Q \edef#1{\number\MT@count}% - } - \def\MT@scale#1#2#3{% -Q \multiply #1 #2\relax - \ifnum #3 = \z@ -X #1=\numexpr #1 * #2\relax - \else -X #1=\numexpr #1 * #2 / #3\relax -Q \divide #1 #3\relax - \fi - } +\def\MT@increment#1{% +^^X \edef#1{\number\numexpr #1 + 1\relax}% +^^Q \MT@count=#1\relax +^^Q \advance\MT@count \@ne +^^Q \edef#1{\number\MT@count}% +} +\def\MT@scale#1#2#3{% +^^Q \multiply #1 #2\relax + \ifnum #3 = \z@ +^^X #1=\numexpr #1 * #2\relax + \else +^^X #1=\numexpr #1 * #2 / #3\relax +^^Q \divide #1 #3\relax + \fi } \def\MT@abbr@pr{protrusion} \def\MT@abbr@ex{expansion} @@ -508,7 +502,7 @@ Q \divide #1 #3\relax \@ifl@aded{tex}{wordcount}{% \MT@warning@nl{Detected the `wordcount' utility.\MessageBreak Disabling `\MT@MT', since it wouldn't work}% - \MT@clear@options\endinput}\relax + \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} @@ -556,12 +550,17 @@ Q \divide #1 #3\relax } \def\MT@restore@p@h{\chardef\%`\% \chardef\#`\# } \def\MT@setupfont@hook{% - \MT@with@babel@and@T{spanish} {\MT@ifdefined@c@T\percentsign{\let\%\percentsign}}% - \MT@with@babel@and@T{galician}{\MT@ifdefined@c@T\percentsign{\let\%\percentsign}}% - \MT@with@package@T{csquotes} - {\@ifpackagelater{csquotes}{2005/05/11}\@disablequotes\relax}% - \@ifpackageloaded{hyperref}\MT@restore@p@h - {\MT@with@package@T{tex4ht}\MT@restore@p@h}% + \MT@if@false + \MT@with@babel@and@T{spanish} \MT@if@true + \MT@with@babel@and@T{galician}\MT@if@true + \MT@with@babel@and@T{mexican} \MT@if@true + \ifMT@if@\MT@ifdefined@c@T\percentsign{\let\%\percentsign}\fi + \MT@with@package@T{csquotes}{% + \@ifpackagelater{csquotes}{2005/05/11}\@disablequotes\relax}% + \MT@if@false + \MT@with@package@T{hyperref}\MT@if@true + \MT@with@package@T{tex4ht} \MT@if@true + \ifMT@if@\MT@restore@p@h\fi } \MT@addto@setup{% \MT@with@package@T{pdfcprot}{% @@ -573,14 +572,14 @@ time will almost certainly lead to undesired results. Have your choice!}% } \MT@with@package@T{ledmac}\MT@ledmac@setup \let\MT@setupfont@hook\@empty - \MT@with@babel@and@T{spanish}{% - \g@addto@macro\MT@setupfont@hook{% - \MT@ifdefined@c@T\percentsign{\let\%\percentsign}}% - } - \MT@with@babel@and@T{galician}{% + \MT@if@false + \MT@with@babel@and@T{spanish} \MT@if@true + \MT@with@babel@and@T{galician}\MT@if@true + \MT@with@babel@and@T{mexican} \MT@if@true + \ifMT@if@ \g@addto@macro\MT@setupfont@hook{% \MT@ifdefined@c@T\percentsign{\let\%\percentsign}}% - } + \fi \MT@with@package@T{csquotes}{% \@ifpackagelater{csquotes}{2005/05/11}{% \g@addto@macro\MT@setupfont@hook\@disablequotes @@ -590,9 +589,8 @@ time will almost certainly lead to undesired results. Have your choice!}% numbers, try upgrading the `csquotes' package}% }% } - \@ifpackageloaded - {hyperref}{% - \g@addto@macro\MT@setupfont@hook\MT@restore@p@h + \MT@if@false + \MT@with@package@T{hyperref}{% \pdfstringdefDisableCommands{% \let\pickup@font\MT@orig@pickupfont \let\textmicrotypecontext\@secondoftwo @@ -600,9 +598,10 @@ time will almost certainly lead to undesired results. Have your choice!}% \def\lsstyle{\pdfstringdefWarn\lsstyle}% \def\textls#1#{\pdfstringdefWarn\textls}% }% + \MT@if@true } - {\MT@with@package@T{tex4ht} - {\g@addto@macro\MT@setupfont@hook\MT@restore@p@h}}% + \MT@with@package@T{tex4ht}\MT@if@true + \ifMT@if@\g@addto@macro\MT@setupfont@hook\MT@restore@p@h\fi \MT@with@package@T{listings}{% \g@addto@macro\MT@cfg@catcodes{% \MT@while@num{"30}{"3A}{\catcode\@tempcnta 12\relax}% @@ -663,8 +662,8 @@ time will almost certainly lead to undesired results. Have your choice!}% \MT@register@font \fi } -\MT@requires@pdftex7{ \let\MT@copy@font\relax +\MT@requires@pdftex7{ \def\MT@copy@font@{% \xdef\MT@font@copy{\csname\MT@@font/\MT@ex@context\endcsname}% \expandafter\ifx\MT@font@copy\relax @@ -707,7 +706,7 @@ time will almost certainly lead to undesired results. Have your choice!}% } \newif\ifMT@do \def\MT@maybe@do#1{% - \expandafter\csname ifMT@\csname MT@abbr@#1\endcsname\endcsname + \csname ifMT@\csname MT@abbr@#1\endcsname\endcsname \MT@dotrue \edef\@tempa{\csname MT@#1@setname\endcsname}% \MT@map@clist@n{font,encoding,family,series,shape,size}{% @@ -798,7 +797,7 @@ time will almost certainly lead to undesired results. Have your choice!}% \MT@load@list\MT@pr@c@name \MT@set@listname \MT@let@cn\@tempc{MT@pr@c@\MT@pr@c@name}% - \expandafter\MT@pr@do\@tempc,\relax,% + \expandafter\MT@set@codes\@tempc,\relax,% }\MT@reset@pr@codes } \def\MT@gobble@settings#1\@tempc,\relax,{} @@ -827,19 +826,19 @@ time will almost certainly lead to undesired results. Have your choice!}% \numexpr\@tempcntb+\MT@letterspace@/2\relax } }\relax -\def\MT@pr@do#1,{% +\def\MT@set@codes#1,{% \ifx\relax#1\@empty\else - \MT@pr@split #1==\relax - \expandafter\MT@pr@do + \MT@split@codes #1==\relax + \expandafter\MT@set@codes \fi } -\def\MT@pr@split#1=#2=#3\relax{% +\def\MT@split@codes#1=#2=#3\relax{% \def\@tempa{#1}% \ifx\@tempa\@empty \else \MT@get@slot \ifnum\MT@char > \m@ne \MT@get@char@unit - \MT@pr@split@val#2\relax + \csname MT@\MT@feat @split@val\endcsname#2\relax \fi \fi } @@ -862,36 +861,34 @@ time will almost certainly lead to undesired results. Have your choice!}% }% }% } -\MT@maybe@etex{ - \MT@requires@pdftex3{ - \def\MT@scale@to@em{% - \@tempcntb=\MT@count\relax - \MT@scale\@tempcntb \@tempb \MT@dimen@six - \ifnum\@tempcntb=\z@ \else - \MT@scale@factor - \fi - } - \def\MT@get@charwd{% -X \MT@count=\fontcharwd\MT@font\MT@char\relax -Q \setbox\z@=\hbox{\MT@font \char\MT@char}% -Q \MT@count=\wd\z@ - \ifnum\MT@count=\z@ \MT@info@missing@char \fi - } - \MT@requires@pdftex6{ - \g@addto@macro\MT@get@charwd{% - \MT@ifdefined@c@T\MT@letterspace@ - {\advance\MT@count -\dimexpr\MT@letterspace@ sp *\dimexpr 1em/1000\relax}% - } - }\relax - }{ - \def\MT@scale@to@em{% - \MT@count=\@tempb\relax - \ifnum\MT@count=\z@ \else - \MT@scale@factor - \fi +\MT@requires@pdftex3{ + \def\MT@scale@to@em{% + \@tempcntb=\MT@count\relax + \MT@scale\@tempcntb \@tempb \MT@dimen@six + \ifnum\@tempcntb=\z@ \else + \MT@scale@factor + \fi + } + \def\MT@get@charwd{% +^^X \MT@count=\fontcharwd\MT@font\MT@char\relax +^^Q \setbox\z@=\hbox{\MT@font \char\MT@char}% +^^Q \MT@count=\wd\z@ + \ifnum\MT@count=\z@ \MT@info@missing@char \fi + } + \MT@requires@pdftex6{ + \g@addto@macro\MT@get@charwd{% + \MT@ifdefined@c@T\MT@letterspace@ + {\advance\MT@count -\dimexpr\MT@letterspace@ sp *\dimexpr 1em/1000\relax}% } - \def\MT@get@charwd{\MT@count=\MT@dimen@six} + }\relax +}{ + \def\MT@scale@to@em{% + \MT@count=\@tempb\relax + \ifnum\MT@count=\z@ \else + \MT@scale@factor + \fi } + \def\MT@get@charwd{\MT@count=\MT@dimen@six} } \def\MT@get@font@dimen#1{% \ifnum\fontdimen#1\MT@font=\z@ @@ -902,16 +899,14 @@ Q \MT@count=\wd\z@ \MT@count=\fontdimen#1\MT@font \fi } -\MT@maybe@etex{ - \def\MT@info@missing@char{% - \MT@info@nl{Character `\the\MT@toks' -X \iffontchar\MT@font\MT@char +\def\MT@info@missing@char{% + \MT@info@nl{Character `\the\MT@toks' +^^X \iffontchar\MT@font\MT@char has a width of 0pt -X \else is missing\fi -Q \MessageBreak (it's probably missing) - \MessageBreak in font `\MT@@font'.\MessageBreak - Ignoring protrusion settings for this character}% - } +^^X \else is missing\fi +^^Q \MessageBreak (it's probably missing) + \MessageBreak in font `\MT@@font'.\MessageBreak + Ignoring protrusion settings for this character}% } \def\MT@scale@factor{% \ifnum\csname MT@\MT@feat @factor@\endcsname=\@m \else @@ -1074,13 +1069,14 @@ Q \MessageBreak (it's probably missing) \def\MT@set@ex@codes@s{% \MT@if@list@exists{% \MT@get@ex@opt + \let\MT@get@char@unit\relax \MT@reset@ef@codes \MT@get@inh@list \MT@set@inputenc{c}% \MT@load@list\MT@ex@c@name \MT@set@listname \MT@let@cn\@tempc{MT@ex@c@\MT@ex@c@name}% - \expandafter\MT@ex@do\@tempc,\relax,% + \expandafter\MT@set@codes\@tempc,\relax,% \MT@expandfont }\relax } @@ -1090,10 +1086,10 @@ Q \MessageBreak (it's probably missing) \MT@if@list@exists \MT@get@ex@opt {% - \let\MT@stretch@\MT@stretch - \let\MT@shrink@\MT@shrink - \let\MT@step@\MT@step - \let\MT@auto@\MT@auto + \let\MT@stretch@ \MT@stretch + \let\MT@shrink@ \MT@shrink + \let\MT@step@ \MT@step + \let\MT@auto@ \MT@auto \let\MT@ex@factor@\MT@ex@factor }% \MT@reset@ef@codes @@ -1117,38 +1113,26 @@ Q \MessageBreak (it's probably missing) }{ \let\MT@reset@ef@codes\MT@reset@ef@codes@ } -\def\MT@ex@do#1,{% - \ifx\relax#1\@empty \else - \MT@ex@split #1==\relax - \expandafter\MT@ex@do +\def\MT@ex@split@val#1\relax{% + \@tempcntb=#1\relax + \ifnum\MT@ex@factor@=\@m \else + \MT@scale\@tempcntb \MT@ex@factor@ \@m \fi -} -\def\MT@ex@split#1=#2=#3\relax{% - \def\@tempa{#1}% - \ifx\@tempa\@empty \else - \MT@get@slot - \ifnum\MT@char > \m@ne - \@tempcntb=#2\relax - \ifnum\MT@ex@factor@=\@m \else - \MT@scale\@tempcntb \MT@ex@factor@ \@m - \fi - \ifnum\@tempcntb > \MT@ex@max - \MT@warn@ex@too@large\MT@ex@max - \else - \ifnum\@tempcntb < \MT@ex@min - \MT@warn@ex@too@large\MT@ex@min - \fi - \fi - \efcode\MT@font\MT@char=\@tempcntb - \MT@ifdefined@c@T\MT@ex@inh@name{% - \MT@ifdefined@n@T{MT@inh@\MT@ex@inh@name @\MT@char @}{% - \expandafter\MT@map@tlist@c - \csname MT@inh@\MT@ex@inh@name @\MT@char @\endcsname - \MT@set@ex@heirs - }% - }% + \ifnum\@tempcntb > \MT@ex@max + \MT@warn@ex@too@large\MT@ex@max + \else + \ifnum\@tempcntb < \MT@ex@min + \MT@warn@ex@too@large\MT@ex@min \fi \fi + \efcode\MT@font\MT@char=\@tempcntb + \MT@ifdefined@c@T\MT@ex@inh@name{% + \MT@ifdefined@n@T{MT@inh@\MT@ex@inh@name @\MT@char @}{% + \expandafter\MT@map@tlist@c + \csname MT@inh@\MT@ex@inh@name @\MT@char @\endcsname + \MT@set@ex@heirs + }% + }% } \def\MT@warn@ex@too@large#1{% \MT@warning@nl{Expansion factor \number\@tempcntb\space too large for @@ -1202,25 +1186,9 @@ Q \MessageBreak (it's probably missing) \MT@load@list\MT@sp@c@name \MT@set@listname \MT@let@cn\@tempc{MT@sp@c@\MT@sp@c@name}% - \expandafter\MT@sp@do\@tempc,\relax,% + \expandafter\MT@set@codes\@tempc,\relax,% }\MT@reset@sp@codes } -\def\MT@sp@do#1,{% - \ifx\relax#1\@empty \else - \MT@sp@split #1==\relax - \expandafter\MT@sp@do - \fi -} -\def\MT@sp@split#1=#2=#3\relax{% - \def\@tempa{#1}% - \ifx\@tempa\@empty \else - \MT@get@slot - \ifnum\MT@char > \m@ne - \MT@get@char@unit - \MT@sp@split@val#2\relax - \fi - \fi -} \def\MT@sp@split@val#1,#2,#3\relax{% \def\@tempb{#1}% \MT@ifempty\@tempb\relax{% @@ -1292,25 +1260,9 @@ Q \MessageBreak (it's probably missing) \MT@load@list\MT@kn@c@name \MT@set@listname \MT@let@cn\@tempc{MT@kn@c@\MT@kn@c@name}% - \expandafter\MT@kn@do\@tempc,\relax,% + \expandafter\MT@set@codes\@tempc,\relax,% }\MT@reset@kn@codes } -\def\MT@kn@do#1,{% - \ifx\relax#1\@empty \else - \MT@kn@split #1==\relax - \expandafter\MT@kn@do - \fi -} -\def\MT@kn@split#1=#2=#3\relax{% - \def\@tempa{#1}% - \ifx\@tempa\@empty \else - \MT@get@slot - \ifnum\MT@char > \m@ne - \MT@get@char@unit - \MT@kn@split@val#2\relax - \fi - \fi -} \def\MT@kn@split@val#1,#2\relax{% \def\@tempb{#1}% \MT@ifempty\@tempb\relax{% @@ -1583,9 +1535,8 @@ Q \MessageBreak (it's probably missing) } }{ \DeclareRobustCommand\lsstyle{% - \MT@warning{Letterspacing only works with pdftex version 1.40\MessageBreak - or newer. You might want to use the `soul' package\MessageBreak - instead}% + \MT@error{Letterspacing only works with pdftex version 1.40\MessageBreak + or newer}{Upgrade pdftex, or use the `soul' package instead.}% \MT@glet\lsstyle\relax } } @@ -1637,39 +1588,39 @@ Q \MessageBreak (it's probably missing) } \def\MT@ls@outer@k{\ifhmode\kern\MT@outer@kern\relax\fi} \MT@requires@pdftex5{ - \def\MT@noligatures{% - \MT@dotrue - \let\@tempa\MT@nl@setname - \MT@map@clist@n{font,encoding,family,series,shape,size}{% - \MT@ifdefined@n@TF{MT@checklist@##1}% - {\csname MT@checklist@##1\endcsname}% - {\MT@checklist@{##1}}% - {nl}% - }% - \ifMT@do - \MT@noligatures@\MT@font\MT@nl@ligatures - \fi - } - \def\MT@noligatures@#1#2{% - \MT@ifdefined@c@TF#2{% - \MT@ifdefined@c@TF\tagcode{% - \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 - }% - \MT@vinfo{... Disabling ligatures for characters: #2}% - }{% - \pdfnoligatures#1% - \MT@warning{Cannot disable selected ligatures (pdftex doesn't\MessageBreak - know \@backslashchar tagcode). Disabling all ligatures of\MessageBreak - the font instead}% +\def\MT@noligatures{% + \MT@dotrue + \let\@tempa\MT@nl@setname + \MT@map@clist@n{font,encoding,family,series,shape,size}{% + \MT@ifdefined@n@TF{MT@checklist@##1}% + {\csname MT@checklist@##1\endcsname}% + {\MT@checklist@{##1}}% + {nl}% + }% + \ifMT@do + \MT@noligatures@\MT@font\MT@nl@ligatures + \fi +} +\def\MT@noligatures@#1#2{% + \MT@ifdefined@c@TF#2{% + \MT@ifdefined@c@TF\tagcode{% + \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 }% + \MT@vinfo{... Disabling ligatures for characters: #2}% }{% \pdfnoligatures#1% - \MT@vinfo{... Disabling ligatures}% + \MT@warning{Cannot disable selected ligatures (pdftex doesn't\MessageBreak + know \@backslashchar tagcode). Disabling all ligatures of\MessageBreak + the font instead}% }% - } + }{% + \pdfnoligatures#1% + \MT@vinfo{... Disabling ligatures}% + }% +} }\relax \def\MT@load@list#1{% \edef\@tempa{#1}% @@ -1686,7 +1637,7 @@ Q \MessageBreak (it's probably missing) \edef\MT@curr@list@name{\@nameuse{MT@abbr@\MT@feat} list \noexpand\MessageBreak`\@tempb'}% \MT@let@cn\@tempc{MT@\MT@feat @c@\@tempb}% - \expandafter\csname MT@\MT@feat @do\expandafter\endcsname\@tempc,\relax,% + \expandafter\MT@set@codes\@tempc,\relax,% }{% \MT@error{\@nameuse{MT@abbr@\MT@feat} list `\@tempb' undefined.\MessageBreak Cannot load it from list `\@tempa'}{}% @@ -2375,7 +2326,6 @@ Q \MessageBreak (it's probably missing) \KV@@sp@def\@tempa{#2}% \MT@ifdefined@n@TF{MT@#1@set@@\@tempa}{% \MT@xdef@n{MT@#1@setname}{\@tempa}% - \MT@info{Using \@nameuse{MT@abbr@#1} set `\@tempa'}% }{% \MT@ifdefined@n@TF{MT@#1@setname}\relax{% \MT@xdef@n{MT@#1@setname}{\@nameuse{MT@default@#1@set}}% @@ -2458,24 +2408,24 @@ Q \MessageBreak (it's probably missing) \fi } \MT@requires@pdftex5{ - \def\DisableLigatures{% - \MT@begin@catcodes - \MT@DisableLigatures - } - \newcommand*\MT@DisableLigatures[2][]{% - \MT@ifempty{#1}\relax{\gdef\MT@nl@ligatures{#1}}% - \xdef\MT@active@features{\MT@active@features,nl}% - \global\MT@noligaturestrue - \MT@declare@sets{nl}{no ligatures}{#2}% - \gdef\MT@nl@setname{no ligatures}% - \MT@end@catcodes - } +\def\DisableLigatures{% + \MT@begin@catcodes + \MT@DisableLigatures +} +\newcommand*\MT@DisableLigatures[2][]{% + \MT@ifempty{#1}\relax{\gdef\MT@nl@ligatures{#1}}% + \xdef\MT@active@features{\MT@active@features,nl}% + \global\MT@noligaturestrue + \MT@declare@sets{nl}{no ligatures}{#2}% + \gdef\MT@nl@setname{no ligatures}% + \MT@end@catcodes +} }{ - \renewcommand*\DisableLigatures[2][]{% - \MT@warning{Disabling ligatures of a font is only possible\MessageBreak - with pdftex version 1.30 or newer.\MessageBreak - Ignoring \string\DisableLigatures}% - } +\renewcommand*\DisableLigatures[2][]{% + \MT@error{Disabling ligatures of a font is only possible\MessageBreak + with pdftex version 1.30 or newer.\MessageBreak + Ignoring \string\DisableLigatures}{Upgrade pdftex.}% +} } \def\DeclareMicrotypeBabelHook#1#2{% \MT@map@clist@n{#1}{% @@ -2961,8 +2911,8 @@ Q \MessageBreak (it's probably missing) `#2'. Assuming `false'}% } \def\MT@optwarn@nan#1#2{% - \MT@warning@nl{Value `#1' for option `#2' is not a\MessageBreak number. - Using default value of \number\@nameuse{MT@#2@default}}% + \MT@warning@nl{Value `#1' for option `#2' is not a\MessageBreak number. + Using default value of \number\@nameuse{MT@#2@default}}% } \def\MT@opt@def@set#1{% \MT@ifdefined@n@TF{MT@\@tempb @set@@\MT@val}{% @@ -3069,8 +3019,7 @@ Q \MessageBreak (it's probably missing) \MT@def@bool@opt{copyfonts}{% \csname if\@tempa\endcsname \MT@error{The pdftex version you are using is too old\MessageBreak - to use the `copyfonts' option} - {Upgrade pdftex.}% + to use the `copyfonts' option}{Upgrade pdftex.}% \fi } } @@ -3202,10 +3151,9 @@ Q \MessageBreak (it's probably missing) \MT@let@nc{MT@\@tempb @level}\tw@ \MT@info{Setting #1 to level 2}% }% - }{\MT@warning{% - Value `\MT@val' for key `#1' not recognised.\MessageBreak - Use any of `true', `false', `compatibility' or\MessageBreak - `nocompatibility'}% + }{\MT@error{Value `\MT@val' for key `#1' not recognised} + {Use any of `true', `false', `compatibility' or + `nocompatibility'.}% }% }% }% @@ -3218,11 +3166,11 @@ Q \MessageBreak (it's probably missing) }% } \def\MT@checksetup#1{% - \expandafter\csname ifMT@#1\endcsname + \csname ifMT@#1\endcsname \expandafter\@firstofone \else - \MT@warning{You cannot enable #1 if it was disabled\MessageBreak - in the package options,}% + \MT@error{You cannot enable #1 if it was disabled\MessageBreak + in the package options}{Load microtype with #1 enabled.}% \expandafter\@gobble \fi } @@ -3244,8 +3192,8 @@ Q \MessageBreak (it's probably missing) \MT@ifstreq\MT@val{false}{% \@tempcnta=\z@ \MT@info{Disabling #1}% - }{\MT@warning{Value `\MT@val' for key `#1' not recognised. - \MessageBreak Use either `true' or `false'}% + }{\MT@error{Value `\MT@val' for key `#1' not recognised} + {Use either `true' or `false'}% }% }% \ifnum\@tempcnta>\m@ne @@ -3281,19 +3229,20 @@ Q \MessageBreak (it's probably missing) \def\MT@ProcessOptionsWithKV#1{% \let\@tempc\relax \let\MT@temp\@empty - \MT@map@clist@c\@classoptionslist{% - \def\CurrentOption{##1}% - \MT@ifdefined@n@T{KV@#1@\CurrentOption}{% - \edef\MT@temp{\MT@temp,\CurrentOption,}% - \@expandtwoargs\@removeelement\CurrentOption - \@unusedoptionlist\@unusedoptionlist + \MT@map@clist@c\@classoptionslist{% + \def\CurrentOption{##1}% + \MT@ifdefined@n@T{KV@#1@\expandafter\MT@getkey\CurrentOption=\@nil}{% + \edef\MT@temp{\MT@temp,\CurrentOption,}% + \@expandtwoargs\@removeelement\CurrentOption + \@unusedoptionlist\@unusedoptionlist + }% }% - }% - \edef\MT@temp{\noexpand\setkeys{#1}% - {\MT@temp\@ptionlist{\@currname.\@currext}}}% + \edef\MT@temp{\noexpand\setkeys{#1}% + {\MT@temp\@ptionlist{\@currname.\@currext}}}% \MT@temp \MT@clear@options } +\def\MT@getkey#1=#2\@nil{#1} \MT@ProcessOptionsWithKV{MT} \MT@addto@setup{% \ifMT@draft @@ -3331,11 +3280,7 @@ Q \MessageBreak (it's probably missing) \let\MT@stretch\MT@stretch@default \fi \ifnum\MT@shrink=\m@ne - \ifnum\MT@stretch>\z@ - \let\MT@shrink\MT@stretch - \else - \let\MT@shrink\MT@shrink@default - \fi + \let\MT@shrink\MT@stretch \fi \ifnum\MT@step=\m@ne \ifnum\MT@stretch>\MT@shrink @@ -3366,22 +3311,24 @@ Q \MessageBreak (it's probably missing) \MT@requires@pdftex4{% \ifnum\pdfoutput<\@ne \ifMT@opt@auto - \MT@warning@nl{% + \MT@error{% Automatic font expansion only works for PDF output.\MessageBreak - However, you are creating a DVI file. I will switch\MessageBreak - automatic font expansion off and hope that expanded\MessageBreak - fonts are available} + However, you are creating a DVI file} + {If you have created expanded fonts instances, remove `auto' from% + \MessageBreak the package options. Otherwise, you have to switch + off expansion\MessageBreak completely.} \fi \MT@autofalse \else \def\MT@auto{autoexpand} \fi }{% - \MT@warning@nl{% + \MT@error{% The pdftex version you are using is too old for\MessageBreak - automatic font expansion. I will switch it off and\MessageBreak - hope that expanded fonts are available.\MessageBreak - Otherwise, install pdftex version 1.20 or newer} + automatic font expansion}% + {If you have created expanded fonts instances, remove `auto' from\MessageBreak + the package options. Otherwise, you have to switch off expansion\MessageBreak + completely, or upgrade pdftex to version 1.20 or newer.} \MT@autofalse \def\MT@auto{1000 } } @@ -3411,7 +3358,7 @@ Q \MessageBreak (it's probably missing) (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\MT@copy@font@ .\MessageBreak + \ifx\MT@copy@font\relax\else .\MessageBreak Set up for expansion contexts (using font copies)\fi} \def\MT@check@step#1{% \@tempcnta=\csname MT@#1\endcsname @@ -3493,20 +3440,20 @@ Q \MessageBreak (it's probably missing) }{ \MT@addto@setup{% \ifMT@tracking - \MT@warning@nl{Tracking only works with pdftex version 1.40\MessageBreak - or newer. Switching it off}% + \MT@error{Tracking only works with pdftex version 1.40\MessageBreak + or newer. Switching it off}{Upgrade pdftex.}% \else \MT@info@nl{No tracking (pdftex too old)} \fi \ifMT@spacing - \MT@warning@nl{Adjustment of interword spacing only works with\MessageBreak - pdftex version 1.40 or newer. Switching it off}% + \MT@error{Adjustment of interword spacing only works with\MessageBreak + pdftex version 1.40 or newer. Switching it off}{Upgrade pdftex.}% \else \MT@info@nl{No adjustment of interword spacing (pdftex too old)} \fi \ifMT@kerning - \MT@warning@nl{Character kerning only works with\MessageBreak - pdftex version 1.40 or newer. Switching it off}% + \MT@error{Character kerning only works with\MessageBreak + pdftex version 1.40 or newer. Switching it off}{Upgrade pdftex.}% \else \MT@info@nl{No adjustment of character kerning (pdftex too old)} \fi @@ -3557,9 +3504,9 @@ Q \MessageBreak (it's probably missing) \shorthandoff{#2}} }{ \def\MT@shorthandoff#1#2{% - \MT@error{You must load the `babel' package before \MT@MT} - {Otherwise, `\MT@MT' cannot switch off the active characters - for #1 babel.}} + \MT@error{You must load `babel' before `\MT@MT'} + {Otherwise, `\MT@MT' cannot switch off #1 babel's\MessageBreak + active characters.}} } \MT@addto@setup{% \ifMT@babel @@ -3580,8 +3527,8 @@ Q \MessageBreak (it's probably missing) \MT@with@babel@and@T{french} \MT@if@true \MT@with@babel@and@T{frenchb} \MT@if@true \MT@with@babel@and@T{francais}\MT@if@true - \MT@with@babel@and@T{acadian} \MT@if@true \MT@with@babel@and@T{canadien}\MT@if@true + \MT@with@babel@and@T{acadian} \MT@if@true \ifMT@if@\MT@shorthandoff{French}{:;!?}\fi \MT@if@false \MT@with@babel@and@T{turkish} \MT@if@true @@ -3597,6 +3544,7 @@ Q \MessageBreak (it's probably missing) \MT@addto@setup\fi \AtBeginDocument\selectfont \edef\MT@curr@file{\jobname.tex} +\MT@restore@catcodes \endinput %% %% End of file `microtype.sty'. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-bch.cfg b/Master/texmf-dist/tex/latex/microtype/mt-bch.cfg index 5d215e875c1..11bbdfb76a8 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--2007 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2008 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 08a1da84b10..ef6b547b6f7 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--2007 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2008 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 902ef9c5a00..84d04c746b1 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--2007 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2008 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 @@ -37,7 +37,7 @@ %% ------------------------------------------------------------------------ %% \ProvidesFile - {mt-cmr.cfg}[2005/11/07 v1.9 microtype config. file: Computer Modern Roman (RS)] + {mt-cmr.cfg}[2008/02/29 v1.9a microtype config. file: Computer Modern Roman (RS)] %%% ----------------------------------------------------------------------- %%% PROTRUSION @@ -84,7 +84,7 @@ \% = {50,50}, * = {300,300}, + = {250,250}, - ( = {100, }, ) = { ,300}, + ( = {300, }, ) = { ,300}, / = {200,300}, - = {400,500}, \textendash = {400,300}, \textemdash = {300,200}, @@ -133,8 +133,7 @@ { encoding = {T1,LY1}, family = lmr } { - \textquotedblleft = {500,300}, - \quotedblbase = {500,300} + \textquotedblleft = {300,400}, \textquotedblright = {300,400} } \SetProtrusion @@ -316,8 +315,8 @@ family = lmr, shape = {it,sl} } { - \textquotedblleft = {700,100}, - \quotedblbase = {600,300} + \textquotedblleft = { ,200}, \textquotedblright = { ,200}, + \quotesinglbase = { ,400}, \quotedblbase = { ,500} } \SetProtrusion diff --git a/Master/texmf-dist/tex/latex/microtype/mt-euf.cfg b/Master/texmf-dist/tex/latex/microtype/mt-euf.cfg index bb0fe053766..d77d1e824ee 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--2007 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2008 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 322aca21634..c4a0bbc5ca4 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--2007 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2008 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 8e95bf4c786..f8fc054b03f 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--2007 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2008 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 41601c2e61d..56e6270c53b 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--2007 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2008 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 97c13b45e11..c28404be02f 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--2007 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2008 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 143f2b4569a..406355b33e2 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--2007 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2008 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 b443e7a6e74..ff368e9750d 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--2007 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2008 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 8d47ddb9af5..df3ca494a07 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--2007 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2008 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 49b382eb367..b1878d5e022 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--2007 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2008 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 37495a21e03..23bbf9dc6a3 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--2007 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2008 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 c2e9574670e..bcff01a082b 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--2007 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2008 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 3961d196e07..e65c09de9e0 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--2007 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2008 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 01768ae5ad5..43b5a04b6e6 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--2007 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2008 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 |