summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/microtype
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2006-09-12 18:44:18 +0000
committerKarl Berry <karl@freefriends.org>2006-09-12 18:44:18 +0000
commitaa5bcfcff570aee548a6b1862b127c6eea71b69a (patch)
treedb5f8f8e01ec11c3dcc1f98a8aee4370a018fca1 /Master/texmf-dist/tex/latex/microtype
parent9642deff953a1af218d8dbfa14b60d270da470e9 (diff)
microtype update (11sep06)
git-svn-id: svn://tug.org/texlive/trunk@2115 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/microtype')
-rw-r--r--Master/texmf-dist/tex/latex/microtype/microtype.sty327
-rw-r--r--Master/texmf-dist/tex/latex/microtype/mt-eur.cfg5
2 files changed, 162 insertions, 170 deletions
diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.sty b/Master/texmf-dist/tex/latex/microtype/microtype.sty
index 496d7dae339..0b80729f708 100644
--- a/Master/texmf-dist/tex/latex/microtype/microtype.sty
+++ b/Master/texmf-dist/tex/latex/microtype/microtype.sty
@@ -25,8 +25,8 @@
%% ------------------------------------------------------------------------
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{microtype}[2006/07/28
- v1.9e
+\ProvidesPackage{microtype}[2006/09/09
+ v1.9f
Micro-typography with pdfTeX (RS)]
\newcommand*\DeclareMicrotypeSet[3][]{}
\newcommand*\UseMicrotypeSet[2][]{}
@@ -64,7 +64,7 @@
\def\MT@info{\PackageInfo\MT@MT}
\def\MT@info@nl#1{\MT@info{#1\@gobble}}
\let\MT@vinfo\@gobble
-\let\MT@pdftex@no\z@
+\def\MT@pdftex@no{0}
\ifx\normalpdftexversion\@undefined \else
\let\pdftexversion \normalpdftexversion
\let\pdftexrevision\normalpdftexrevision
@@ -76,17 +76,17 @@
\ifnum\pdftexversion < 130
\def\MT@pdftex@no{4}
\ifnum\pdftexversion < 120
- \let\MT@pdftex@no\thr@@
+ \def\MT@pdftex@no{3}
\ifnum\pdftexversion = 14
\ifnum \expandafter`\pdftexrevision < `h
- \let\MT@pdftex@no\tw@
+ \def\MT@pdftex@no{2}
\ifnum \expandafter`\pdftexrevision < `f
- \let\MT@pdftex@no\@ne
+ \def\MT@pdftex@no{1}
\fi
\fi
\else
\ifnum\pdftexversion < 14
- \let\MT@pdftex@no\@ne
+ \def\MT@pdftex@no{1}
\fi
\fi
\fi
@@ -129,6 +129,7 @@
\AtEndOfPackage{\MT@restore@catcodes}
\RequirePackage{keyval}[1997/11/10]
\newtoks\MT@toks
+\newif\ifMT@if@
\newif\ifMT@protrusion
\newif\ifMT@expansion
\newif\ifMT@auto
@@ -170,12 +171,15 @@
\expandafter\@firstoftwo
\fi
}
+\def\MT@glet{\global\let}
\def\MT@def@n#1{\expandafter\def\csname #1\endcsname}
+\def\MT@gdef@n#1{\expandafter\gdef\csname #1\endcsname}
\def\MT@edef@n#1{\expandafter\edef\csname #1\endcsname}
+\def\MT@xdef@n#1{\expandafter\xdef\csname #1\endcsname}
\def\MT@let@nc#1{\expandafter\let\csname #1\endcsname}
\def\MT@let@cn#1#2{\expandafter\let\expandafter#1\csname #2\endcsname}
\def\MT@let@nn#1{\expandafter\MT@let@cn\csname #1\endcsname}
-\def\MT@exp@string{\expandafter\string}
+\def\MT@@font{\expandafter\string\MT@font}
\def\MT@exp@one@n#1#2{\expandafter#1\expandafter{#2}}
\def\MT@exp@two@c#1{\expandafter\expandafter\expandafter#1\expandafter}
\def\MT@exp@two@n#1#2#3{%
@@ -448,7 +452,7 @@
}
\let\MT@setup@\@empty
\def\MT@addto@setup{\g@addto@macro\MT@setup@}
-\AtBeginDocument{\MT@setup@ \global\let\MT@setup@\@empty}
+\AtBeginDocument{\MT@setup@ \MT@glet\MT@setup@\@empty}
\def\MT@with@package#1{\@ifpackageloaded{#1}\@firstofone\@gobble}
\def\MT@pdfcprot@error{%
\MT@error{Detected the `pdfcprot' package!\MessageBreak
@@ -545,7 +549,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\expandafter\ifx\the\font\nullfont\normalfont\fi
\def\MT@setupfont{%
\ifx\MT@vinfo\MT@info@nl
- \MT@info{Setting up font `\MT@exp@string\MT@font'}\fi
+ \MT@info{Setting up font `\MT@@font'}\fi
\MT@setupfont@hook
\MT@exp@two@c\MT@split@name\string\MT@font\@nil
\MT@exp@one@n\MT@find@file\MT@family
@@ -662,6 +666,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\MT@get@opt
\MT@reset@pr@codes
\MT@get@inh@list
+ \MT@set@inputenc{c}%
\MT@load@list\MT@pr@c@name
\MT@set@listname
\MT@let@cn\@tempc{MT@pr@c@\MT@pr@c@name}%
@@ -679,7 +684,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\def\MT@get@dimen@six{%
\ifnum\fontdimen6\MT@font=\z@
\MT@warning@nl{%
- Font `\MT@exp@string\MT@font' does not specify its\MessageBreak
+ Font `\MT@@font' does not specify its\MessageBreak
\@backslashchar fontdimen 6 (width of an `em')! Therefore,\MessageBreak
\@nameuse{MT@abbr@\MT@feat} will not work with this font}%
\expandafter\MT@gobble@settings
@@ -765,14 +770,14 @@ time will almost certainly lead to undesired results. Have your choice!}%
\def\MT@info@missing@char{%
\MT@info@nl{Character `\the\MT@toks' \iffontchar\MT@font\MT@char
has a width of 0pt \else is missing \fi in font\MessageBreak
- `\MT@exp@string\MT@font'. Ignoring protrusion settings\MessageBreak
+ `\MT@@font'. Ignoring protrusion settings\MessageBreak
for this character}%
}
}{
\def\MT@info@missing@char{%
\MT@info@nl{%
Character `\the\MT@toks' has a width of 0pt\MessageBreak
- (it's probably missing) in font `\MT@exp@string\MT@font'.\MessageBreak
+ (it's probably missing) in font `\MT@@font'.\MessageBreak
Ignoring protrusion settings for this character}%
}
}
@@ -838,8 +843,6 @@ 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}{%
\csname MT@preset@\MT@feat\endcsname
\MT@let@nc{MT@reset@\MT@feat @codes}\relax
@@ -873,15 +876,16 @@ 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}{%
+\def\MT@set@inputenc#1{%
+ \def\MT@cat{#1}%
+ \MT@ifdefined@n@T{%
+ MT@\MT@feat @#1@\csname MT@\MT@feat @#1@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@\MT@feat @#1@\csname MT@\MT@feat @#1@name\endcsname @inputenc}}%
}{%
\MT@error{Key `inputenc' used in \MT@curr@list@name, but the `inputenc'
- \MessageBreak package isn't loaded}%
+ \MessageBreak package isn't loaded. Ignoring key}%
{You must load the `inputenc' package before you can use the `inputenc' key.}%
}%
}%
@@ -928,6 +932,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\MT@get@ex@opt
\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}%
@@ -1017,9 +1022,7 @@ 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@ifdefined@n@T{MT@ex@c@\MT@ex@c@name @preset}{%
\MT@preset@ex
\let\MT@reset@ef@codes\relax
}%
@@ -1063,7 +1066,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
}
\def\MT@load@list#1{%
\edef\@tempa{#1}%
- \MT@let@cn\@tempb{MT@\MT@feat @c@\@tempa load}%
+ \MT@let@cn\@tempb{MT@\MT@feat @c@\@tempa @load}%
\MT@ifstreq\@tempa\@tempb{%
\MT@warning{\@nameuse{MT@abbr@\MT@feat} list `\@tempa' cannot load itself}%
}{%
@@ -1073,7 +1076,8 @@ time will almost certainly lead to undesired results. Have your choice!}%
\begingroup
\MT@load@list\@tempb
\endgroup
- \edef\MT@curr@list@name{\@nameuse{MT@abbr@\MT@feat} list\MessageBreak`\@tempb'}%
+ \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,%
}{%
@@ -1156,10 +1160,10 @@ time will almost certainly lead to undesired results. Have your choice!}%
}
\def\MT@next@listname#1#2#3#4{%
\edef\@tempa{\MT@encoding
- /\ifnum#1=\@ne \MT@family\fi
- /\ifnum#2=\@ne \MT@series\fi
- /\ifnum#3=\@ne \MT@shape\fi
- /\ifnum#4=\@ne *\fi
+ /\ifnum#1=\@ne \MT@family\fi
+ /\ifnum#2=\@ne \MT@series\fi
+ /\ifnum#3=\@ne \MT@shape\fi
+ /\ifnum#4=\@ne *\fi
\MT@context}%
\MT@ifdefined@n@TF{MT@\@tempb @\@tempa}{%
\MT@next@listname@#4%
@@ -1196,10 +1200,9 @@ time will almost certainly lead to undesired results. Have your choice!}%
\MT@ifdefined@c@TF\MT@listname{%
\MT@edef@n{MT@\MT@feat @c@name}{\MT@listname}%
\ifMT@nonselected
- \MT@vinfo{... Applying non-selected expansion (list `\MT@ex@c@name')}%
+ \MT@vinfo{... Applying non-selected expansion (list `\MT@listname')}%
\else
- \MT@vinfo{... Loading \@nameuse{MT@abbr@\MT@feat} list
- `\@nameuse{MT@\MT@feat @c@name}'}%
+ \MT@vinfo{... Loading \@nameuse{MT@abbr@\MT@feat} list `\MT@listname'}%
\fi
\@firstoftwo
}{%
@@ -1208,7 +1211,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\MT@vinfo{... Applying non-selected expansion}%
\else
\MT@warning{I cannot find a \@nameuse{MT@abbr@\MT@feat} list
- for font\MessageBreak`\MT@exp@string\MT@font'%
+ for font\MessageBreak`\MT@@font'%
\ifx\MT@context\@empty\else\space(context: `\MT@context')\fi.
Switching off\MessageBreak\@nameuse{MT@abbr@\MT@feat} for this font}%
\fi
@@ -1220,15 +1223,13 @@ time will almost certainly lead to undesired results. Have your choice!}%
\MT@get@listname{\MT@feat @inh}%
\MT@ifdefined@c@TF\MT@listname{%
\MT@edef@n{MT@\MT@feat @inh@name}{\MT@listname}%
- \MT@let@cn\@tempc{MT@\MT@feat @inh@\csname MT@\MT@feat @inh@name\endcsname}%
+ \MT@let@cn\@tempc{MT@\MT@feat @inh@\MT@listname}%
\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
+ \edef\MT@curr@list@name{inheritance list\noexpand\MessageBreak`\MT@listname'}%
+ \MT@set@inputenc{inh}%
\expandafter\MT@inh@do\@tempc,\relax,%
- \global\MT@let@nc{MT@\MT@feat @inh@\csname MT@\MT@feat @inh@name\endcsname}\@empty
+ \global\MT@let@nc{MT@\MT@feat @inh@\MT@listname}\@empty
\endgroup
\fi
}{%
@@ -1312,7 +1313,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\let\IeC\@firstofone
\let\@inpenc@undefined@\MT@undefined@char
\def\UTFviii@defined##1{\ifx ##1\relax
- \MT@undefined@char{utf8}\else\expandafter##1\fi}%
+ \MT@undefined@char{utf8}\else\expandafter##1\fi}%
\edef\x{%
\def\noexpand\@tempa{\@tempa}%
\MT@toks={\the\MT@toks\space(= \@tempa)}%
@@ -1361,7 +1362,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\fi
}
\def\MT@set@listname{%
- \edef\MT@curr@list@name{\@nameuse{MT@abbr@\MT@feat} list\MessageBreak
+ \edef\MT@curr@list@name{\@nameuse{MT@abbr@\MT@feat} list\noexpand\MessageBreak
`\@nameuse{MT@\MT@feat @c@name}'}%
}
\def\MT@warn@ascii{%
@@ -1377,24 +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'\MT@warn@maybe@inputenc
+ Unknown slot number of character\MessageBreak`\the\MT@toks'%
+ \MT@warn@maybe@inputenc\MessageBreak
+ in font encoding `\MT@encoding'.\MessageBreak
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'\MT@warn@maybe@inputenc
- in \MT@curr@list@name}%
+ Unknown slot number of character\MessageBreak`\the\MT@toks'%
+ \MT@warn@maybe@inputenc\MessageBreak
+ in font encoding `\MT@encoding' 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}%
+ {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}')}%
}
\let\MT@font@list\@empty
\let\MT@font\@empty
@@ -1426,7 +1426,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\MT@setupfont
\MT@register@font
\fi
- \global\let\MT@font\@empty
+ \MT@glet\MT@font\@empty
\endgroup
}
\let\MT@pickupfont\pickup@font
@@ -1442,17 +1442,17 @@ time will almost certainly lead to undesired results. Have your choice!}%
\def\MT@register@font{\xdef\MT@font@list{\MT@font@list\MT@font,}}
\let\MT@active@features\@empty
\def\MT@check@font@cx{%
- \@tempswatrue
+ \MT@if@true
\MT@map@clist@c\MT@active@features{%
\expandafter\MT@exp@one@n\expandafter\MT@in@clist\expandafter\MT@font
\csname MT@##1@\csname MT@##1@context\endcsname font@list\endcsname
\ifMT@inlist@
\MT@let@nc{MT@\@nameuse{MT@abbr@##1}}\relax
\else
- \@tempswafalse
+ \MT@if@false
\fi
}%
- \if@tempswa \MT@inlist@true \else \MT@inlist@false \fi
+ \ifMT@if@ \MT@inlist@true \else \MT@inlist@false \fi
}
\def\MT@register@subst@font@cx{%
\MT@map@clist@c\MT@active@features{%
@@ -1484,23 +1484,24 @@ time will almost certainly lead to undesired results. Have your choice!}%
\MT@addto@setup{%
\def\microtypecontext#1{%
\MT@setup@contexts
+ \let\MT@reset@context\relax
\setkeys{MTC}{#1}%
\selectfont
- \aftergroup\MT@reset@context
+ \MT@reset@context
}%
}
-\def\MT@reset@context{%
- \MT@vinfo{Resetting contexts on line \the\inputlineno
+\def\MT@reset@context@{%
+ \MT@vinfo{<<< Resetting contexts\on@line
}%
\selectfont
}
\def\MT@setup@contexts{%
\MT@map@clist@c\MT@active@features
{\global\MT@let@nc{MT@##1@@font@list}\MT@font@list}%
- \global\let\MT@check@font\MT@check@font@cx
- \global\let\MT@register@font\MT@register@font@cx
- \global\let\MT@register@subst@font\MT@register@subst@font@cx
- \global\let\MT@setup@contexts\relax
+ \MT@glet\MT@check@font\MT@check@font@cx
+ \MT@glet\MT@register@font\MT@register@font@cx
+ \MT@glet\MT@register@subst@font\MT@register@subst@font@cx
+ \MT@glet\MT@setup@contexts\relax
}
\def\MT@define@context#1{%
\define@key{MTC}{#1}[]{%
@@ -1509,8 +1510,11 @@ time will almost certainly lead to undesired results. Have your choice!}%
\MT@exp@one@n\MT@in@clist\@tempb\MT@active@features
\ifMT@inlist@
\MT@ifempty{##1}{\def\MT@val{@}}{\KV@@sp@def\MT@val{##1}}%
- \expandafter\ifx\csname MT@\@tempb @context\endcsname\MT@val \else
- \MT@vinfo{--- Changing #1 context to `\MT@val'}%
+ \expandafter\ifx\csname MT@\@tempb @context\endcsname\MT@val
+ \else
+ \MT@vinfo{>>> Changing #1 context to `\MT@val'\MessageBreak\on@line
+ }%
+ \def\MT@reset@context{\aftergroup\MT@reset@context@}%
\global\MT@let@nn{MT@reset@\@tempb @codes}{MT@reset@\@tempb @codes@}%
\expandafter\MT@exp@one@n\expandafter\MT@in@tlist
\expandafter\MT@val\csname MT@\@tempb @doc@contexts\endcsname
@@ -1751,11 +1755,11 @@ time will almost certainly lead to undesired results. Have your choice!}%
\def\MT@use@set#1#2{%
\KV@@sp@def\@tempa{#2}%
\MT@ifdefined@n@TF{MT@#1@set@@\@tempa}{%
- \global\MT@edef@n{MT@#1@setname}{\@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{%
- \global\MT@edef@n{MT@#1@setname}{\@nameuse{MT@default@#1@set}}%
+ \MT@xdef@n{MT@#1@setname}{\@nameuse{MT@default@#1@set}}%
}%
\MT@warning{%
The \@nameuse{MT@abbr@#1} set `\@tempa' is undeclared.\MessageBreak
@@ -1774,7 +1778,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\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
+ \MT@glet\DisableLigatures\@gobble
}
}
\renewcommand*\DeclareMicrotypeSetDefault[2][]{%
@@ -1796,12 +1800,12 @@ time will almost certainly lead to undesired results. Have your choice!}%
\def\MT@set@default@set#1#2{%
\KV@@sp@def\@tempa{#2}%
\MT@ifdefined@n@TF{MT@#1@set@@\@tempa}{%
- \global\MT@edef@n{MT@default@#1@set}{\@tempa}%
+ \MT@xdef@n{MT@default@#1@set}{\@tempa}%
}{%
\MT@warning{%
The \@nameuse{MT@abbr@#1} set `\@tempa' is not declared.\MessageBreak
Cannot make it the default set. Using set\MessageBreak `all' instead}%
- \global\MT@edef@n{MT@default@#1@set}{all}%
+ \MT@xdef@n{MT@default@#1@set}{all}%
}%
}
\renewcommand*\DeclareMicrotypeAlias[2]{%
@@ -1812,9 +1816,9 @@ time will almost certainly lead to undesired results. Have your choice!}%
\MT@warning{Alias font family `\@tempb' will override
alias `\@nameuse{MT@\@tempa @alias}'\MessageBreak
for font family `\@tempa'}}%
- \global\MT@edef@n{MT@\@tempa @alias}{\@tempb}%
+ \MT@xdef@n{MT@\@tempa @alias}{\@tempb}%
\MT@ifdefined@c@T\MT@family{%
- \global\let\MT@familyalias\@tempb
+ \MT@glet\MT@familyalias\@tempb
}%
}
\def\LoadMicrotypeFile#1{%
@@ -1836,67 +1840,48 @@ time will almost certainly lead to undesired results. Have your choice!}%
\MT@end@catcodes
\fi
}
-\renewcommand*\SetProtrusion[2][]{%
- \let\MT@pr@c@name\@undefined
+\def\SetProtrusion{%
+ \MT@begin@catcodes
+ \MT@SetProtrusion
+}
+\newcommand*\MT@SetProtrusion[3][]{%
\let\MT@extra@context\@empty
- \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,inputenc}{\MT@set@opt{pr}{##1}}%
+ \MT@set@named@keys{MT@pr@c}{#1}%
\def\MT@permutelist{pr@c}%
\setkeys{MT@cfg}{#2}%
\MT@permute
- \MT@begin@catcodes
- \MT@set@pr@list
-}
-\def\MT@set@pr@list#1{%
- \global\MT@def@n{MT@pr@c@\MT@pr@c@name}{#1}%
+ \MT@gdef@n{MT@pr@c@\MT@pr@c@name}{#3}%
\MT@end@catcodes
}
-\renewcommand*\SetExpansion[2][]{%
- \let\MT@ex@c@name\@undefined
+\def\SetExpansion{%
+ \MT@begin@catcodes
+ \MT@SetExpansion
+}
+\newcommand*\MT@SetExpansion[3][]{%
\let\MT@extra@context\@empty
- \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,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
- large in list\MessageBreak `\MT@ex@c@name'. Setting it to the
+ \MT@set@named@keys{MT@ex@c}{#1}%
+ \MT@ifdefined@n@T{MT@ex@c@\MT@ex@c@name @factor}{%
+ \ifnum\csname MT@ex@c@\MT@ex@c@name @factor\endcsname>\@m
+ \MT@warning@nl{Expansion factor \number\@nameuse{MT@ex@c@\MT@ex@c@name @factor}
+ too large in list\MessageBreak `\MT@ex@c@name'. Setting it to the
maximum of 1000}%
- \let\MT@extra@factor\@m
+ \global\MT@let@nc{MT@ex@c@\MT@ex@c@name @factor}\@m
\fi
- \global\MT@let@nc{MT@ex@c@\MT@ex@c@name @factor}\MT@extra@factor
}%
\def\MT@permutelist{ex@c}%
\setkeys{MT@cfg}{#2}%
\MT@permute
- \MT@begin@catcodes
- \MT@set@ex@list
-}
-\def\MT@set@ex@list#1{%
- \global\MT@def@n{MT@ex@c@\MT@ex@c@name}{#1}%
+ \MT@gdef@n{MT@ex@c@\MT@ex@c@name}{#3}%
\MT@end@catcodes
}
-\def\MT@get@codes@name#1{%
- \MT@ifdefined@n@TF{MT@#1@c@name}{%
- \MT@ifdefined@n@T{MT@#1@c@\csname MT@#1@c@name\endcsname}{%
- \MT@warning{Redefining list `\@nameuse{MT@#1@c@name}'}%
- }%
- }{%
- \MT@edef@n{MT@#1@c@name}{\MT@curr@file/\the\inputlineno}%
- }%
- \MT@let@cn\MT@curr@set@name{MT@#1@c@name}%
- \MT@ifdefined@c@T\MT@extra@load{%
- \global\MT@let@nc{MT@#1@c@\MT@curr@set@name load}\MT@extra@load
- }%
-}
-\def\MT@set@opt#1#2{%
- \MT@ifdefined@n@T{MT@extra@#2}{%
- \global\MT@let@nn{MT@#1@c@\csname MT@#1@c@name\endcsname @#2}{MT@extra@#2}%
+\def\MT@set@named@keys#1#2{%
+ \def\x##1name=##2,##3\@nil{%
+ \setkeys{#1}{name=##2}%
+ \def\MT@options{##1##3}%
+ \MT@rem@from@clist{name=}\MT@options
}%
+ \x#2,name=,\@nil
+ \@expandtwoargs\setkeys{#1}\MT@options
}
\def\MT@define@code@key#1#2{%
\define@key{MT@#2}{#1}[]{%
@@ -1926,7 +1911,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\MT@map@clist@n{##1}{%
\KV@@sp@def\MT@val{####1}%
\expandafter\MT@get@font@and@size\MT@val/////\@nil
- \global\MT@edef@n{MT@\MT@permutelist @\@tempb\MT@extra@context}%
+ \MT@xdef@n{MT@\MT@permutelist @\@tempb\MT@extra@context}%
{\csname MT@\MT@permutelist @name\endcsname}%
\expandafter\MT@xaddb
\csname MT@\MT@permutelist @\@tempb\MT@extra@context @sizes\endcsname
@@ -1958,24 +1943,32 @@ time will almost certainly lead to undesired results. Have your choice!}%
\MT@define@code@key{shape}{cfg}
\MT@define@code@key@size{cfg}
\MT@define@code@key@font{cfg}
-\def\MT@declare@codes#1{%
+\def\MT@define@opt@keys#1{%
\define@key{MT@#1@c}{name}[]{%
- \MT@ifempty{##1}\relax{\MT@def@n{MT@#1@c@name}{##1}}}%
- \define@key{MT@#1@c}{load}[]{%
- \MT@ifempty{##1}\relax{\def\MT@extra@load{##1}}}%
- \define@key{MT@#1@c}{factor}[]{%
- \MT@ifempty{##1}\relax{\def\MT@extra@factor{##1 }}}%
- \define@key{MT@#1@c}{preset}[]{%
- \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}}
+ \MT@ifempty{##1}{%
+ \MT@edef@n{MT@#1@c@name}{\MT@curr@file/\the\inputlineno}%
+ }{%
+ \MT@edef@n{MT@#1@c@name}{##1}%
+ \MT@ifdefined@n@T{MT@#1@c@\csname MT@#1@c@name\endcsname}{%
+ \MT@warning{Redefining list `\@nameuse{MT@#1@c@name}'}%
+ }%
+ }%
+ \MT@let@cn\MT@curr@set@name{MT@#1@c@name}%
+ }%
+ \MT@define@opt@key{#1}{load}%
+ \MT@define@opt@key{#1}{factor}%
+ \MT@define@opt@key{#1}{preset}%
+ \MT@define@opt@key{#1}{inputenc}%
+ \define@key{MT@#1@c}{context}[]{\MT@ifempty{##1}\relax{\def\MT@extra@context{##1}}}%
+}
+\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}}}%
+}
+\MT@map@clist@c\MT@features{\MT@define@opt@keys{#1}}
\define@key{MT@pr@c}{unit}[character]{%
- \let\MT@extra@unit\@empty
- \KV@@sp@def\@tempa{#1}%
+ \global\MT@let@nc{MT@pr@c@\MT@curr@set@name @unit}\@empty
+ \def\@tempa{#1}%
\MT@ifstreq\@tempa{relative}{%
\MT@warning{Value `relative' for key `unit' is deprecated.\MessageBreak
Use `unit=character' instead. For now, I'll do it\MessageBreak
@@ -1984,7 +1977,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
}\relax
\MT@ifstreq\@tempa{character}\relax{%
\MT@ifdimen\@tempa{%
- \let\MT@extra@unit\@tempa
+ \global\MT@let@nc{MT@pr@c@\MT@curr@set@name @unit}\@tempa
}{%
\MT@warning{`\@tempa' is not a dimension.\MessageBreak
Ignoring it and setting values relative to\MessageBreak
@@ -1992,11 +1985,11 @@ time will almost certainly lead to undesired results. Have your choice!}%
}%
}%
}
-\def\MT@define@ex@c@key#1{%
+\def\MT@define@ex@opt@key#1{%
\define@key{MT@ex@c}{#1}[]{%
\MT@ifempty{##1}\relax{%
\MT@ifint{##1}{%
- \MT@def@n{MT@extra@#1}{##1 }%
+ \MT@gdef@n{MT@ex@c@\MT@curr@set@name @#1}{##1 }%
}{%
\MT@warning{%
Value `##1' for option `#1' is not a number.\MessageBreak
@@ -2005,20 +1998,20 @@ time will almost certainly lead to undesired results. Have your choice!}%
}%
}%
}
-\MT@define@ex@c@key{stretch}
-\MT@define@ex@c@key{shrink}
-\MT@define@ex@c@key{step}
+\MT@define@ex@opt@key{stretch}
+\MT@define@ex@opt@key{shrink}
+\MT@define@ex@opt@key{step}
\define@key{MT@ex@c}{auto}[true]{%
- \KV@@sp@def\@tempa{#1}%
+ \def\@tempa{#1}%
\csname if\@tempa\endcsname
\MT@requires@pdftex4{%
- \def\MT@extra@auto{autoexpand}%
+ \MT@gdef@n{MT@ex@c@\MT@curr@set@name @auto}{autoexpand}%
}{%
- \MT@warning{pdfTeX too old for automatic font expansion}%
+ \MT@warning{pdftex too old for automatic font expansion}%
}
\else
\MT@requires@pdftex4{%
- \let\MT@extra@auto\@empty
+ \global\MT@let@nc{MT@ex@c@\MT@curr@set@name @auto}\@empty
}\relax
\fi
}
@@ -2044,16 +2037,16 @@ time will almost certainly lead to undesired results. Have your choice!}%
}%
\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}}}
+ \define@key{MT@inh@}{#1}[]{\edef\MT@inh@feat{\MT@inh@feat#1,}}}
+\define@key{MT@inh@}{inputenc}{\def\MT@extra@inputenc{#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}%
+ \MT@xdef@n{MT@#1@inh@\MT@curr@set@name @inputenc}{\MT@extra@inputenc}}%
+ \MT@gdef@n{MT@#1@inh@\csname MT@#1@inh@name\endcsname}{#3}%
\def\MT@permutelist{#1@inh}%
\setkeys{MT@inh}{#2}%
\MT@permute
@@ -2094,7 +2087,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\MT@get@slot
\ifnum\MT@char > \m@ne
\expandafter\MT@xadd
- \csname MT@inh@\MT@inh@name @\MT@val @\endcsname
+ \csname MT@inh@\MT@listname @\MT@val @\endcsname
{{\MT@char}}%
\fi
\fi
@@ -2179,7 +2172,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
for font `\@tempa'}%
}%
}%
- \global\MT@edef@n{MT@\MT@permutelist @\@tempa\MT@extra@context}%
+ \MT@xdef@n{MT@\MT@permutelist @\@tempa\MT@extra@context}%
{\csname MT@\MT@permutelist @name\endcsname}%
\fi
\fi
@@ -2195,7 +2188,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\MT@permute@reset@{family}%
\MT@permute@reset@{series}%
\MT@permute@reset@{shape}%
- \let\MT@tempsize\@undefined
+ \MT@glet\MT@tempsize\@undefined
}
\def\MT@permute@reset@#1{%
\@tempcnta=\@ne
@@ -2211,7 +2204,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\def\MT@check@rlist@#1#2#3{%
\def\@tempb{#1}%
\def\@tempc{#2}%
- \@tempswafalse
+ \MT@if@false
\expandafter\MT@map@tlist@c
\csname MT@\MT@permutelist @\@tempa\MT@extra@context @sizes\endcsname
\MT@check@range
@@ -2220,11 +2213,11 @@ time will almost certainly lead to undesired results. Have your choice!}%
\def\MT@check@range@#1#2#3{%
\MT@ifdim{#2}=\m@ne{%
\MT@ifdim\@tempc=\m@ne{%
- \MT@ifdim\@tempb={#1}\@tempswatrue\relax
+ \MT@ifdim\@tempb={#1}\MT@if@true\relax
}{%
\MT@ifdim\@tempb>{#1}\relax{%
\MT@ifdim\@tempc>{#1}{%
- \@tempswatrue
+ \MT@if@true
\edef\@tempb{#1 (with range: \@tempb\space to \@tempc)}%
}\relax
}%
@@ -2232,18 +2225,18 @@ time will almost certainly lead to undesired results. Have your choice!}%
}{%
\MT@ifdim\@tempc=\m@ne{%
\MT@ifdim\@tempb<{#2}{%
- \MT@ifdim\@tempb<{#1}\relax\@tempswatrue
+ \MT@ifdim\@tempb<{#1}\relax\MT@if@true
}\relax
}{%
\MT@ifdim\@tempb<{#2}{%
\MT@ifdim\@tempc>{#1}{%
- \@tempswatrue
+ \MT@if@true
\edef\@tempb{#1 to #2 (with range: \@tempb\space to \@tempc)}%
}\relax
}\relax
}%
}%
- \if@tempswa
+ \ifMT@if@
\MT@warning{\@nameuse{MT@abbr@\MT@permutelist} list
`\@nameuse{MT@\MT@permutelist @name}' will override\MessageBreak
list `#3' for font \@tempa,\MessageBreak size \@tempb}%
@@ -2273,9 +2266,9 @@ time will almost certainly lead to undesired results. Have your choice!}%
\MT@let@nc{MT@\@tempb @level}\tw@
}{%
\MT@ifdefined@n@TF{MT@\@tempb @set@@\MT@val}{%
- \global\MT@edef@n{MT@\@tempb @setname}{\MT@val}%
+ \MT@xdef@n{MT@\@tempb @setname}{\MT@val}%
}{%
- \global\MT@edef@n{MT@\@tempb @setname}%
+ \MT@xdef@n{MT@\@tempb @setname}%
{\@nameuse{MT@default@\@tempb @set}}%
\MT@warning@nl{%
The #1 set `\MT@val' is undeclared.\MessageBreak
@@ -2433,7 +2426,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
}
\MT@map@clist@c\MT@features{%
\MT@ifdefined@n@TF{MT@default@#1@set}\relax
- {\global\MT@def@n{MT@default@#1@set}{all}}%
+ {\MT@gdef@n{MT@default@#1@set}{all}}%
}
\MT@ifdefined@c@T\MicroType@Hook{\MT@warning{%
Command \string\MicroType@Hook\space is deprecated.\MessageBreak
@@ -2570,7 +2563,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\MT@ifdefined@c@TF\MT@pr@setname{%
\MT@info@nl{Using protrusion set `\MT@pr@setname'}%
}{%
- \global\let\MT@pr@setname\MT@default@pr@set
+ \MT@glet\MT@pr@setname\MT@default@pr@set
\MT@info@nl{Using default protrusion set `\MT@pr@setname'}%
}
\else
@@ -2628,13 +2621,11 @@ time will almost certainly lead to undesired results. Have your choice!}%
\def\MT@auto{autoexpand}
\fi
}{%
- \ifMT@opt@auto
- \MT@warning@nl{%
- The pdftex you are using is too old for automatic\MessageBreak
- font expansion. I will switch it off and hope that\MessageBreak
- expanded fonts are available on your system.\MessageBreak
- Install pdftex version 1.20 or newer}
- \fi
+ \MT@warning@nl{%
+ 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}
\MT@autofalse
\def\MT@auto{1000 }
}
@@ -2667,7 +2658,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\MT@ifdefined@c@TF\MT@ex@setname{%
\MT@info@nl{Using expansion set `\MT@ex@setname'}%
}{%
- \global\let\MT@ex@setname\MT@default@ex@set
+ \MT@glet\MT@ex@setname\MT@default@ex@set
\MT@info@nl{Using default expansion set `\MT@ex@setname'}%
}
\CheckCommand*\showhyphens[1]{\setbox0\vbox{%
diff --git a/Master/texmf-dist/tex/latex/microtype/mt-eur.cfg b/Master/texmf-dist/tex/latex/microtype/mt-eur.cfg
index b749cf5eb84..b01eb32268b 100644
--- a/Master/texmf-dist/tex/latex/microtype/mt-eur.cfg
+++ b/Master/texmf-dist/tex/latex/microtype/mt-eur.cfg
@@ -34,7 +34,7 @@
%% ------------------------------------------------------------------------
%%
\ProvidesFile
- {mt-eur.cfg}[2006/07/28 v1.0 microtype config. file: AMS Euler Roman (RS)]
+ {mt-eur.cfg}[2006/07/31 v1.1 microtype config. file: AMS Euler Roman (RS)]
%%% -----------------------------------------------------------------------
%%% PROTRUSION SETTINGS
@@ -94,7 +94,8 @@
}
\SetProtrusion
- [ name = euler-vm ]
+ [ name = euler-vm,
+ load = euler ]
{ encoding = U,
family = zeur }
{