microtype update (5jun08)

git-svn-id: svn://tug.org/texlive/trunk@8641 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 241 insertions, 187 deletions

diff --git a/Master/texmf-dist/tex/latex/microtype/letterspace.sty b/Master/texmf-dist/tex/latex/microtype/letterspace.sty
index 5256e48c772..2a21385d8bd 100644
--- a/Master/texmf-dist/tex/latex/microtype/letterspace.sty
+++ b/Master/texmf-dist/tex/latex/microtype/letterspace.sty
@@ -32,7 +32,7 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage
   {letterspace}
-  [2008/02/29 v2.3a
+  [2008/06/04 v2.3b
    Robust letterspacing (RS)%
   ]
 \def\MT@MT
@@ -64,13 +64,13 @@
 \newcommand*\lslig[1]{#1}
 \def\MT@warning{\PackageWarning\MT@MT}
 \def\MT@warning@nl#1{\MT@warning{#1\@gobble}}
-\def\MT@plain{0}
+\def\MT@plain{2}
 \ifx\documentclass\@undefined
   \def\MT@plain{1}
   \def\hmode@bgroup{\leavevmode\bgroup}
   \let\@typeset@protect\relax
   \ifx\eplain\@undefined
-    \def\MT@plain{2}
+    \def\MT@plain{0}
     \def\PackageWarning#1#2{%
       \begingroup
         \newlinechar=10 %
@@ -82,6 +82,9 @@
     \def\@spaces{\space\space\space\space}
   \fi
 \fi
+\def\MT@requires@latex#1{%
+  \ifnum\MT@plain<#1 \expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi
+}
 \def\MT@pdftex@no{0}
 \ifx\normalpdftexversion\@undefined \else
   \let\pdftexversion \normalpdftexversion
@@ -97,10 +100,10 @@
   \fi
 \fi
 \def\MT@clear@options{%
-  \ifnum\MT@plain<2
+  \MT@requires@latex1{%
   \AtEndOfPackage{\let\@unprocessedoptions\relax}%
   \let\CurrentOption\@empty
-  \fi
+  }\relax
 }
 \ifnum\MT@pdftex@no <
     6
@@ -134,7 +137,8 @@
   \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@cs#1#2{\expandafter#1\csname#2\endcsname}
+\def\MT@edef@n{\MT@exp@cs\edef}
 \def\MT@exp@one@n#1#2{\expandafter#1\expandafter{#2}}
 \def\MT@exp@two@c#1{\expandafter\expandafter\expandafter#1\expandafter}
 \def\MT@ifdefined@c@TF#1{%
@@ -189,34 +193,33 @@
     \ifnum\@tempcnta < #2\MT@repeat
 }
 \def\MT@do@font{\MT@while@num\z@\@cclvi}
-\ifnum\MT@plain<2
+\MT@requires@latex1{
 \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
+}{\let\MT@addto@setup\@firstofone}
 \def\MT@with@package@T#1{\@ifpackageloaded{#1}\@firstofone\@gobble}
 \MT@addto@setup{%
-  \ifnum\MT@plain=0
+  \MT@requires@latex2{
   \MT@with@package@T{hyperref}{%
     \pdfstringdefDisableCommands{%
       \def\lsstyle{\pdfstringdefWarn\lsstyle}%
       \def\textls#1#{\pdfstringdefWarn\textls}%
     }%
   }
-  \fi
-  \ifnum\MT@plain=0
+  }\relax
+  \MT@requires@latex2{
   \MT@with@package@T{soul}{%
     \soulregister\lsstyle 0%
     \soulregister\textls  1%
   }
-  \else
-    \ifx\SOUL@\@undefined\else
+  }{\ifx\SOUL@\@undefined\else
       \soulregister\lsstyle 0%
       \soulregister\textls  1%
-    \fi
-  \fi
+    \fi}
 }
-\let\MT@tracking\relax
+\let\MT@tracking
+  \relax
 \def\MT@set@tr@codes{%
   \MT@ifdefined@c@TF\MT@letterspace@\relax{\let\MT@letterspace@\MT@letterspace}%
   \ifnum\MT@letterspace@=\z@\else
@@ -226,31 +229,34 @@
     \expandafter\ifx\MT@lsfont\relax
       \MT@get@ls@basefont
       \global\expandafter\letterspacefont\MT@lsfont\font@name\MT@letterspace@
+      % spacing = {<letterspace amount>*,,}
       \fontdimen2\MT@lsfont=\dimexpr\numexpr 1000+\MT@letterspace@\relax sp
                                             * \fontdimen2\MT@lsfont/1000\relax
+      % no ligatures = {f}
       \tagcode\MT@lsfont`f=\m@ne
+      \MT@do@font{\lpcode\MT@lsfont\@tempcnta=\numexpr\MT@letterspace@/2\relax
+                  \rpcode\MT@lsfont\@tempcnta=\numexpr\MT@letterspace@/2\relax}%
     \fi
     \aftergroup\MT@set@lsfont
     \xdef\MT@set@curr@ls{\def\noexpand\MT@curr@ls{\MT@letterspace@}}%
     \aftergroup\MT@set@curr@ls
     \ifx\MT@ls@adjust\@empty
+      % \textls : outer kerning = {*,*} ; \textls* : outer kerning = {0,0}
       \MT@outer@kern=-\dimexpr\MT@letterspace@ sp * \fontdimen6\font@name/2000\relax
       \MT@ls@outer@k
       \xdef\MT@set@curr@ok{\MT@outer@kern=\the\MT@outer@kern\relax}%
       \aftergroup\aftergroup\aftergroup\MT@set@curr@ok
       \aftergroup\aftergroup\aftergroup\MT@ls@outer@k
     \fi
-    \MT@do@font{\lpcode\MT@lsfont\@tempcnta=\numexpr\MT@letterspace@/2\relax
-                \rpcode\MT@lsfont\@tempcnta=\numexpr\MT@letterspace@/2\relax}%
   \fi
 }
-\ifnum\MT@plain=0
+\MT@requires@latex2{
 \def\MT@set@lsfont{\MT@exp@two@c\let\font@name\MT@lsfont}
 \DeclareRobustCommand\lsstyle{%
   \let\MT@tracking\MT@set@tr@codes
   \selectfont
 }
-\else
+}{
 \def\MT@set@lsfont{\MT@lsfont}
 \def\lsstyle{%
   \begingroup
@@ -261,7 +267,7 @@
 }
 \let\textls\@undefined
 \let\lslig\@undefined
-\fi
+}
 \DeclareRobustCommand\lslig[1]{%
   {\MT@ifdefined@c@TF\MT@curr@ls{%
      \escapechar\m@ne
@@ -306,17 +312,32 @@
 }
 \newdimen\MT@outer@kern
 \def\MT@ls@outer@k{\ifhmode\kern\MT@outer@kern\relax\fi}
-\ifnum\MT@plain=0
+\MT@requires@latex2{
 \MT@addto@setup{%
   \@ifpackageloaded{CJK}{
-    \@ifpackagelater{CJK}{2006/10/17}
-      {\def\MT@orig@pickupfont{\CJK@ifundefined\CJK@plane}} % 4.7.0
+    \@ifpackagelater{CJK}{2006/10/17} % 4.7.0
+      {\def\MT@orig@pickupfont{\CJK@ifundefined\CJK@plane}}
       {\def\MT@orig@pickupfont{\@ifundefined{CJK@plane}}}
-    \g@addto@macro\MT@orig@pickupfont{%
-      {\expandafter\ifx\font@name\relax\define@newfont\fi}%
+    \g@addto@macro\MT@orig@pickupfont
+      {{\expandafter\ifx\font@name\relax\define@newfont\fi}}
+    \@ifpackageloaded{CJKutf8}
+      {\@ifpackagelater{CJKutf8}{2008/05/22} % 4.8.0
+        {\ifpdf\expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi}
+        {\@firstoftwo}}
+      {\@firstoftwo}
+    {\g@addto@macro\MT@orig@pickupfont{%
       {\expandafter\ifx\csname\curr@fontshape/\f@size/\CJK@plane\endcsname\relax
-         \define@newfont\else\xdef\font@name
-            {\csname \curr@fontshape/\f@size/\CJK@plane\endcsname}\fi}}
+         \define@newfont\else\xdef\font@name{%
+           \csname \curr@fontshape/\f@size/\CJK@plane\endcsname}\fi}}}
+    {\g@addto@macro\MT@orig@pickupfont{%
+      {\expandafter\ifx\csname \curr@fontshape/\f@size/\CJK@plane\endcsname\relax
+         \define@newfont\def\CJK@temp{v}%
+         \ifx\CJK@temp\CJK@plane
+           \expandafter\ifx\csname CJK@cmap@\f@family\CJK@plane\endcsname\relax
+           \else\csname CJK@cmap@\f@family\CJK@plane\endcsname\fi
+         \else \CJK@addcmap\CJK@plane \fi
+       \else\xdef\font@name{%
+         \csname \curr@fontshape/\f@size/\CJK@plane\endcsname}\fi}}}
   }{
     \def\MT@orig@pickupfont{\expandafter\ifx\font@name\relax\define@newfont\fi}
   }
@@ -334,14 +355,14 @@
     \endgroup
   }
 }
-\fi
-\ifnum\MT@plain<2
+}\relax
+\MT@requires@latex1{
 \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}}%
 }
-\fi
-\ifnum\MT@plain<2
+}\relax
+\MT@requires@latex1{
 \MT@map@clist@n{%
     letterspace}{%
   \define@key{MT}{#1}[\csname MT@#1@default\endcsname]{%
@@ -351,12 +372,12 @@
       {\MT@optwarn@nan{##1}{#1}}%
   }%
 }
-\fi
-\ifnum\MT@plain<2
+}\relax
+\MT@requires@latex1{
 \def\MT@ProcessOptionsWithKV#1{%
   \let\@tempc\relax
   \let\MT@temp\@empty
-  \ifnum\MT@plain=0
+  \MT@requires@latex2{
     \MT@map@clist@c\@classoptionslist{%
       \def\CurrentOption{##1}%
       \MT@ifdefined@n@T{KV@#1@\expandafter\MT@getkey\CurrentOption=\@nil}{%
@@ -367,16 +388,14 @@
     }%
     \edef\MT@temp{\noexpand\setkeys{#1}%
                     {\MT@temp\@ptionlist{\@currname.\@currext}}}%
-  \else
-    \edef\MT@temp{\noexpand\setkeys{#1}%
-                    {\csname usepkg@options@\usepkg@pkg\endcsname}}%
-  \fi
+  }{\edef\MT@temp{\noexpand\setkeys{#1}%
+                    {\csname usepkg@options@\usepkg@pkg\endcsname}}}
   \MT@temp
   \MT@clear@options
 }
 \def\MT@getkey#1=#2\@nil{#1}
 \MT@ProcessOptionsWithKV{MT}
-\fi
+}\relax
   \MT@addto@setup{%
     \ifnum\pdfoutput<\@ne
       \def\MT@warn@tracking@DVI{%
diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.cfg b/Master/texmf-dist/tex/latex/microtype/microtype.cfg
index 5c2a9d8cf48..7b7cf2d906a 100644
--- a/Master/texmf-dist/tex/latex/microtype/microtype.cfg
+++ b/Master/texmf-dist/tex/latex/microtype/microtype.cfg
@@ -39,7 +39,7 @@
 %%
 \ProvidesFile
   {microtype.cfg}
-  [2008/02/29 v2.3a
+  [2008/06/04 v2.3b
    microtype main configuration file (RS)%
   ]
 
diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.sty b/Master/texmf-dist/tex/latex/microtype/microtype.sty
index 372ecc4adf2..fb4c267d40f 100644
--- a/Master/texmf-dist/tex/latex/microtype/microtype.sty
+++ b/Master/texmf-dist/tex/latex/microtype/microtype.sty
@@ -28,7 +28,7 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage
   {microtype}
-  [2008/02/29 v2.3a
+  [2008/06/04 v2.3b
    Micro-typography with pdfTeX (RS)%
   ]
 \def\MT@MT
@@ -232,13 +232,17 @@
   {}
 \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@exp@cs#1#2{\expandafter#1\csname#2\endcsname}
+\def\MT@exp@gcs#1#2{\begingroup\expandafter\endgroup\expandafter#1\csname#2\endcsname}
+\def\MT@def@n{\MT@exp@cs\def}
+\def\MT@gdef@n{\MT@exp@gcs\gdef}
+\def\MT@edef@n{\MT@exp@cs\edef}
+\def\MT@xdef@n{\MT@exp@gcs\xdef}
+\def\MT@let@nc{\MT@exp@cs\let}
+\def\MT@glet@nc{\MT@exp@gcs\MT@glet}
 \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@let@nn{\MT@exp@cs\MT@let@cn}
+\def\MT@glet@nn{\MT@exp@gcs{\global\expandafter\MT@let@cn}}
 \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}
@@ -633,9 +637,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
   }
 }
 \expandafter\ifx\the\font\nullfont\normalfont\fi
-\def\MT@setupfont{%
-  \MT@setupfont@hook
-}
+\def\MT@setupfont{\MT@setupfont@hook}
 \MT@requires@pdftex7
   {\g@addto@macro\MT@setupfont\MT@copy@font}\relax
 \g@addto@macro\MT@setupfont{%
@@ -665,7 +667,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
 \let\MT@copy@font\relax
 \MT@requires@pdftex7{
 \def\MT@copy@font@{%
-  \xdef\MT@font@copy{\csname\MT@@font/\MT@ex@context\endcsname}%
+  \xdef\MT@font@copy{\csname\MT@@font/\MT@pr@context/\MT@ex@context\endcsname}%
   \expandafter\ifx\MT@font@copy\relax
     \edef\MT@font@orig{\csname\expandafter\string\font@name @orig\endcsname}%
     \expandafter\ifx\MT@font@orig\relax
@@ -675,11 +677,9 @@ time will almost certainly lead to undesired results. Have your choice!}%
     \fi
     \global\MT@exp@two@c\pdfcopyfont\MT@font@copy\font@name
     \MT@map@clist@c\MT@active@features{%
-      \expandafter\ifx\csname MT@\@nameuse{MT@abbr@##1}\endcsname\relax\else
+      \MT@exp@cs\ifx{MT@\@nameuse{MT@abbr@##1}}\relax\else
         \def\@tempa{##1}%
-        \expandafter\MT@map@tlist@c
-          \csname MT@##1@doc@contexts\endcsname
-          \MT@rem@from@list
+        \MT@exp@cs\MT@map@tlist@c{MT@##1@doc@contexts}\MT@rem@from@list
       \fi
     }%
   \fi
@@ -688,7 +688,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
   \aftergroup\let\aftergroup\font@name\aftergroup\MT@font@copy
 }
 \def\MT@rem@from@list#1{%
-  \expandafter\ifx\csname MT@\@tempa @#1font@list\endcsname\relax\else
+  \MT@exp@cs\ifx{MT@\@tempa @#1font@list}\relax\else
     \expandafter\MT@exp@one@n\expandafter\MT@rem@from@clist\expandafter
        \MT@font \csname MT@\@tempa @#1font@list\endcsname
   \fi
@@ -764,7 +764,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
 \def\MT@checklist@size#1{%
   \MT@ifdefined@n@T
       {MT@#1list@size@\@tempa}{%
-    \expandafter\MT@in@rlist\csname MT@#1list@size@\@tempa\endcsname
+    \MT@exp@cs\MT@in@rlist{MT@#1list@size@\@tempa}%
     \ifMT@inlist@
       \MT@dotrue
     \else
@@ -855,8 +855,8 @@ time will almost certainly lead to undesired results. Have your choice!}%
   }%
   \MT@ifdefined@c@T\MT@pr@inh@name{%
     \MT@ifdefined@n@T{MT@inh@\MT@pr@inh@name @\MT@char @}{%
-      \expandafter\MT@map@tlist@c
-        \csname MT@inh@\MT@pr@inh@name @\MT@char @\endcsname
+      \MT@exp@cs\MT@map@tlist@c
+        {MT@inh@\MT@pr@inh@name @\MT@char @}%
         \MT@set@pr@heirs
     }%
   }%
@@ -914,10 +914,10 @@ time will almost certainly lead to undesired results. Have your choice!}%
       \csname MT@\MT@feat @factor@\endcsname \@m
   \fi
   \ifnum\@tempcntb>\csname MT@\MT@feat @max\endcsname\relax
-    \expandafter\MT@warn@code@too@large\csname MT@\MT@feat @max\endcsname
+    \MT@exp@cs\MT@warn@code@too@large{MT@\MT@feat @max}%
   \else
     \ifnum\@tempcntb<\csname MT@\MT@feat @min\endcsname\relax
-      \expandafter\MT@warn@code@too@large\csname MT@\MT@feat @min\endcsname
+      \MT@exp@cs\MT@warn@code@too@large{MT@\MT@feat @min}%
     \fi
   \fi
 }
@@ -947,11 +947,11 @@ time will almost certainly lead to undesired results. Have your choice!}%
   \MT@ifdefined@n@TF{MT@\MT@feat @c@\csname MT@\MT@feat @c@name\endcsname @unit}{%
     \MT@let@nn{MT@\MT@feat @unit@}%
         {MT@\MT@feat @c@\csname MT@\MT@feat @c@name\endcsname @unit}%
-    \expandafter\ifx\csname MT@\MT@feat @unit@\endcsname\@empty
+    \MT@exp@cs\ifx{MT@\MT@feat @unit@}\@empty
       \MT@vinfo{... : Setting \@nameuse{MT@abbr@\MT@feat} codes
                       relative to character widths}%
     \else
-      \expandafter\ifx\csname MT@\MT@feat @unit@\endcsname\m@ne
+      \MT@exp@cs\ifx{MT@\MT@feat @unit@}\m@ne
         \MT@vinfo{... : Setting \@nameuse{MT@abbr@\MT@feat} codes
                         relative to width of space}%
       \fi
@@ -961,13 +961,13 @@ time will almost certainly lead to undesired results. Have your choice!}%
   }%
   \let\MT@get@char@unit\relax
   \let\MT@get@space@unit\@gobble
-  \expandafter\ifx\csname MT@\MT@feat @unit@\endcsname\@empty
+  \MT@exp@cs\ifx{MT@\MT@feat @unit@}\@empty
     \let\MT@get@char@unit\MT@get@charwd
   \else
-    \expandafter\ifx\csname MT@\MT@feat @unit@\endcsname\m@ne
+    \MT@exp@cs\ifx{MT@\MT@feat @unit@}\m@ne
       \let\MT@get@space@unit\MT@get@font@dimen
     \else
-      \expandafter\MT@get@unit\csname MT@\MT@feat @unit@\endcsname
+      \MT@exp@cs\MT@get@unit{MT@\MT@feat @unit@}%
     \fi
   \fi
   \MT@ifdefined@n@T{MT@\MT@feat @c@\csname MT@\MT@feat @c@name\endcsname @preset}{%
@@ -1128,9 +1128,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
   \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
+      \MT@exp@cs\MT@map@tlist@c{MT@inh@\MT@ex@inh@name @\MT@char @}\MT@set@ex@heirs
     }%
   }%
 }
@@ -1210,9 +1208,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
   }%
   \MT@ifdefined@c@T\MT@sp@inh@name{%
     \MT@ifdefined@n@T{MT@inh@\MT@sp@inh@name @\MT@char @}{%
-      \expandafter\MT@map@tlist@c
-        \csname MT@inh@\MT@sp@inh@name @\MT@char @\endcsname
-        \MT@set@sp@heirs
+      \MT@exp@cs\MT@map@tlist@c{MT@inh@\MT@sp@inh@name @\MT@char @}\MT@set@sp@heirs
     }%
   }%
 }
@@ -1278,9 +1274,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
   }%
   \MT@ifdefined@c@T\MT@kn@inh@name{%
     \MT@ifdefined@n@T{MT@inh@\MT@kn@inh@name @\MT@char @}{%
-      \expandafter\MT@map@tlist@c
-        \csname MT@inh@\MT@kn@inh@name @\MT@char @\endcsname
-        \MT@set@kn@heirs
+      \MT@exp@cs\MT@map@tlist@c{MT@inh@\MT@kn@inh@name @\MT@char @}\MT@set@kn@heirs
     }%
   }%
 }
@@ -1323,7 +1317,8 @@ time will almost certainly lead to undesired results. Have your choice!}%
     \fi
   \fi
 }
-\let\MT@tracking\MT@tracking@
+\let\MT@tracking
+  \MT@tracking@
 \def\MT@set@tr@codes{%
   \MT@vinfo{Tracking font `\MT@@font'\on@line}%
   \MT@get@font@dimen@six
@@ -1349,6 +1344,9 @@ time will almost certainly lead to undesired results. Have your choice!}%
       \MT@ifdefined@c@TF\MT@tr@okern{\let\@tempa\MT@tr@okern}{\def\@tempa{*,*}}%
       \expandafter\MT@tr@set@okern\@tempa,%
       \MT@ifdefined@c@T\MT@tr@ligatures\MT@tr@noligatures
+      \MT@do@font{\lpcode\MT@lsfont\@tempcnta=\numexpr\MT@letterspace@/2\relax
+                  \rpcode\MT@lsfont\@tempcnta=\numexpr\MT@letterspace@/2\relax}%
+      \let\MT@the@pr@code\MT@the@pr@code@tr
     \fi
     \aftergroup\MT@set@lsfont
     \let\MT@font\MT@lsfont
@@ -1363,17 +1361,14 @@ time will almost certainly lead to undesired results. Have your choice!}%
       \MT@ls@outer@k
     \else
       \MT@outer@kern=\expandafter\expandafter\expandafter\@firstoftwo
-                        \csname MT@outer@kern\expandafter\string\font@name\endcsname\relax
+                      \csname MT@outer@kern\expandafter\string\font@name\endcsname\relax
       \ifdim\MT@outer@kern=\z@\else \MT@ls@outer@k \fi
       \MT@outer@kern=\expandafter\expandafter\expandafter\@secondoftwo
-                        \csname MT@outer@kern\expandafter\string\font@name\endcsname\relax
+                      \csname MT@outer@kern\expandafter\string\font@name\endcsname\relax
     \fi
     \xdef\MT@set@curr@ok{\MT@outer@kern=\the\MT@outer@kern\relax}%
     \aftergroup\aftergroup\aftergroup\MT@set@curr@ok
     \aftergroup\aftergroup\aftergroup\MT@tr@outer@r
-    \MT@do@font{\lpcode\MT@lsfont\@tempcnta=\numexpr\MT@letterspace@/2\relax
-                \rpcode\MT@lsfont\@tempcnta=\numexpr\MT@letterspace@/2\relax}%
-    \let\MT@the@pr@code\MT@the@pr@code@tr
   \fi
 }
 \def\MT@get@tr@opt{%
@@ -1439,7 +1434,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
     \MT@warning@nl{%
       Disabling selected ligatures is only possible since\MessageBreak
       pdftex 1.40.4. Disabling all ligatures instead}%
-    \global\let\MT@tr@noligatures\relax
+    \MT@glet\MT@tr@noligatures\relax
   }
 }
 \newskip\MT@outer@space
@@ -1448,7 +1443,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
   \MT@tr@set@space@{#1}{#4}{2}\@empty
   \MT@tr@set@space@{#2}{#5}{3}\@plus
   \MT@tr@set@space@{#3}{#6}{4}\@minus
-  \global\MT@let@nc{MT@outer@space\expandafter\string\font@name}\MT@temp
+  \MT@glet@nc{MT@outer@space\expandafter\string\font@name}\MT@temp
 }
 \def\MT@tr@set@space@#1#2#3#4{%
   \MT@ifempty{#2}{%
@@ -1485,12 +1480,28 @@ time will almost certainly lead to undesired results. Have your choice!}%
   }%
 }
 \def\MT@tr@outer@l{%
-  \ifdim\lastskip>5sp
-    \edef\x{\the\lastskip plus 0pt}%
-    \setbox\z@\hbox{\MT@outer@space=\x}%
-    \ifdim\wd\z@>\z@
-      \unskip \hskip\MT@outer@space\relax
-      \let\MT@ls@outer@k\relax
+  \ifhmode
+    \ifdim\lastskip>5sp
+      \edef\x{\the\lastskip minus 0pt}%
+      \setbox\z@\hbox{\MT@outer@space=\x}%
+      \ifdim\wd\z@>\z@
+        \unskip \hskip\MT@outer@space\relax
+        \let\MT@ls@outer@k\relax
+      \else
+        \ifdim\lastskip=%
+            \ifnum\spacefactor<2000
+              \spaceskip
+            \else
+              \ifdim\xspaceskip=\z@
+                \dimexpr\spaceskip+\fontdimen7\font@name\relax
+              \else
+                \xspaceskip
+              \fi
+            \fi
+          \unskip \hskip\MT@outer@space\relax
+          \let\MT@ls@outer@k\relax
+        \fi
+      \fi
     \fi
   \fi
 }
@@ -1498,8 +1509,8 @@ 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{\hskip\MT@outer@space
-  }%
+  \def\MT@temp*##1{\ifhmode\hskip\MT@outer@space
+    \fi}%
   \ifcat\egroup\noexpand\MT@tr@outer@next
     \unkern\egroup
     \MT@set@curr@ok
@@ -1513,12 +1524,12 @@ time will almost certainly lead to undesired results. Have your choice!}%
         \def\MT@temp*{\aftergroup\MT@tr@outer@r\check@icr\let\x=}%
       \else
         \ifx\@sptoken\MT@tr@outer@next
-          \def\MT@temp* {\hskip\MT@outer@space
-          }%
+          \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
@@ -1569,7 +1580,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
   \let\MT@temp\@empty
   \MT@tr@set@okern@{#1}%
   \MT@tr@set@okern@{#2}%
-  \global\MT@let@nc{MT@outer@kern\expandafter\string\font@name}\MT@temp
+  \MT@glet@nc{MT@outer@kern\expandafter\string\font@name}\MT@temp
 }
 \def\MT@tr@set@okern@#1{%
   \MT@test@ast#1*\@nil{%
@@ -1604,11 +1615,11 @@ time will almost certainly lead to undesired results. Have your choice!}%
 \def\MT@noligatures@#1#2{%
   \MT@ifdefined@c@TF#2{%
     \MT@ifdefined@c@TF\tagcode{%
+      \let\MT@warn@maybe@inputenc\@empty
+      \def\MT@curr@list@name{\@backslashchar DisableLigatures}%
       \MT@map@clist@c#2{%
         \KV@@sp@def\@tempa{##1}\MT@get@slot
-        \ifnum\MT@char > \m@ne
-          \tagcode#1\MT@char=\m@ne\fi
-      }%
+        \ifnum\MT@char>\m@ne \tagcode#1\MT@char=\m@ne \fi}%
       \MT@vinfo{... Disabling ligatures for characters: #2}%
     }{%
       \pdfnoligatures#1%
@@ -1752,7 +1763,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
 }
 \def\MT@next@listname@#1{%
   \ifnum#1=\@ne
-    \expandafter\MT@in@rlist\csname MT@\@tempb @\@tempa @sizes\endcsname
+    \MT@exp@cs\MT@in@rlist{MT@\@tempb @\@tempa @sizes}%
     \ifMT@inlist@
       \let\MT@listname\MT@size@name
     \fi
@@ -1798,7 +1809,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
       \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@\MT@listname}\@empty
+      \MT@glet@nc{MT@\MT@feat @inh@\MT@listname}\@empty
       \endgroup
     \fi
   }{%
@@ -1968,14 +1979,29 @@ time will almost certainly lead to undesired results. Have your choice!}%
 \let\MT@font\@empty
 \MT@addto@setup{%
   \@ifpackageloaded{CJK}{
-    \@ifpackagelater{CJK}{2006/10/17}
-      {\def\MT@orig@pickupfont{\CJK@ifundefined\CJK@plane}} % 4.7.0
+    \@ifpackagelater{CJK}{2006/10/17} % 4.7.0
+      {\def\MT@orig@pickupfont{\CJK@ifundefined\CJK@plane}}
       {\def\MT@orig@pickupfont{\@ifundefined{CJK@plane}}}
-    \g@addto@macro\MT@orig@pickupfont{%
-      {\expandafter\ifx\font@name\relax\define@newfont\fi}%
+    \g@addto@macro\MT@orig@pickupfont
+      {{\expandafter\ifx\font@name\relax\define@newfont\fi}}
+    \@ifpackageloaded{CJKutf8}
+      {\@ifpackagelater{CJKutf8}{2008/05/22} % 4.8.0
+        {\ifpdf\expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi}
+        {\@firstoftwo}}
+      {\@firstoftwo}
+    {\g@addto@macro\MT@orig@pickupfont{%
       {\expandafter\ifx\csname\curr@fontshape/\f@size/\CJK@plane\endcsname\relax
-         \define@newfont\else\xdef\font@name
-            {\csname \curr@fontshape/\f@size/\CJK@plane\endcsname}\fi}}
+         \define@newfont\else\xdef\font@name{%
+           \csname \curr@fontshape/\f@size/\CJK@plane\endcsname}\fi}}}
+    {\g@addto@macro\MT@orig@pickupfont{%
+      {\expandafter\ifx\csname \curr@fontshape/\f@size/\CJK@plane\endcsname\relax
+         \define@newfont\def\CJK@temp{v}%
+         \ifx\CJK@temp\CJK@plane
+           \expandafter\ifx\csname CJK@cmap@\f@family\CJK@plane\endcsname\relax
+           \else\csname CJK@cmap@\f@family\CJK@plane\endcsname\fi
+         \else \CJK@addcmap\CJK@plane \fi
+       \else\xdef\font@name{%
+         \csname \curr@fontshape/\f@size/\CJK@plane\endcsname}\fi}}}
   }{
     \def\MT@orig@pickupfont{\expandafter\ifx\font@name\relax\define@newfont\fi}
   }
@@ -2006,7 +2032,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
   \let\MT@pickupfont\pickup@font
   \g@addto@macro\do@subst@correction
     {\edef\MT@font{\csname\curr@fontshape/\f@size\endcsname}%
-     \global\MT@let@nc{MT@subst@\expandafter\string\font@name}\MT@font}
+     \MT@glet@nc{MT@subst@\expandafter\string\font@name}\MT@font}
   \let\MT@orig@add@accent\add@accent
   \def\add@accent#1#2{%
     \let\pickup@font\MT@orig@pickupfont
@@ -2021,8 +2047,8 @@ time will almost certainly lead to undesired results. Have your choice!}%
 \def\MT@check@font@cx{%
   \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
+    \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
@@ -2033,21 +2059,19 @@ time will almost certainly lead to undesired results. Have your choice!}%
 }
 \def\MT@register@subst@font@cx{%
   \MT@map@clist@c\MT@active@features{%
-    \expandafter\MT@xadd
-      \csname MT@##1@\csname MT@##1@context\endcsname font@list\endcsname
+    \MT@exp@cs\MT@xadd
+      {MT@##1@\csname MT@##1@context\endcsname font@list}%
       {\font@name,}%
   }%
 }
 \def\MT@register@font@cx{%
   \MT@map@clist@c\MT@active@features{%
-    \expandafter\ifx\csname MT@\@nameuse{MT@abbr@##1}\endcsname\relax\else
-      \expandafter\MT@xadd
-        \csname MT@##1@\csname MT@##1@context\endcsname font@list\endcsname
+    \MT@exp@cs\ifx{MT@\@nameuse{MT@abbr@##1}}\relax\else
+      \MT@exp@cs\MT@xadd
+        {MT@##1@\csname MT@##1@context\endcsname font@list}%
         {\MT@font,}%
       \def\@tempa{##1}%
-      \expandafter\MT@map@tlist@c
-        \csname MT@##1@doc@contexts\endcsname
-        \MT@maybe@rem@from@list
+      \MT@exp@cs\MT@map@tlist@c{MT@##1@doc@contexts}\MT@maybe@rem@from@list
     \fi
   }%
 }
@@ -2075,7 +2099,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
 }
 \def\MT@setup@contexts{%
   \MT@map@clist@c\MT@active@features
-    {\global\MT@let@nc{MT@##1@@font@list}\MT@font@list}%
+    {\MT@glet@nc{MT@##1@@font@list}\MT@font@list}%
   \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
@@ -2087,16 +2111,16 @@ 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{@}}{\def\MT@val{##1}}%
-      \expandafter\ifx\csname MT@\@tempb @context\endcsname\MT@val
+      \MT@exp@cs\ifx{MT@\@tempb @context}\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@}%
+        \MT@glet@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
         \ifMT@inlist@ \else
-          \expandafter\MT@xadd\csname MT@\@tempb @doc@contexts\endcsname{{\MT@val}}%
+          \MT@exp@cs\MT@xadd{MT@\@tempb @doc@contexts}{{\MT@val}}%
         \fi
         \MT@edef@n{MT@\@tempb @context}{\MT@val}%
       \fi
@@ -2138,14 +2162,14 @@ time will almost certainly lead to undesired results. Have your choice!}%
   \KV@@sp@def\MT@curr@set@name{#2}%
   \MT@ifdefined@n@T{MT@#1@set@@\MT@curr@set@name}{%
     \MT@warning{Redefining \@nameuse{MT@abbr@#1} set `\MT@curr@set@name'}%
-    \global\MT@let@nc{MT@#1list@size@\MT@curr@set@name}\@empty
+    \MT@glet@nc{MT@#1list@size@\MT@curr@set@name}\@empty
   }%
-  \global\MT@let@nc{MT@#1@set@@\MT@curr@set@name}\@empty
+  \MT@glet@nc{MT@#1@set@@\MT@curr@set@name}\@empty
   \setkeys{MT@#1@set}{#3}%
 }
 \def\MT@define@set@key@#1#2{%
   \define@key{MT@#2@set}{#1}[]{%
-    \global\MT@let@nc{MT@#2list@#1@\MT@curr@set@name}\@empty
+    \MT@glet@nc{MT@#2list@#1@\MT@curr@set@name}\@empty
     \MT@map@clist@n{##1}{%
       \KV@@sp@def\MT@val{####1}%
       \MT@get@highlevel{#1}%
@@ -2178,8 +2202,8 @@ time will almost certainly lead to undesired results. Have your choice!}%
       \KV@@sp@def\MT@val{####1}%
       \expandafter\MT@get@range\MT@val--\@nil
       \ifx\MT@val\relax \else
-        \expandafter\MT@xadd
-          \csname MT@#1list@size@\MT@curr@set@name\endcsname
+        \MT@exp@cs\MT@xadd
+          {MT@#1list@size@\MT@curr@set@name}%
           {{{\MT@lower}{\MT@upper}\relax}}%
       \fi
     }%
@@ -2233,9 +2257,8 @@ time will almost certainly lead to undesired results. Have your choice!}%
   \fi
   \ifx\@tempa\relax \else
     \begingroup
-      \def\set@fontsize##1##2##3##4\@nil{\gdef\MT@val{##2}}%
+      \def\set@fontsize##1##2##3##4\@nil{\endgroup\def\MT@val{##2}}%
       \@tempa\@nil
-    \endgroup
   \fi
   \MT@ifdimen\MT@val{%
     \@defaultunits\@tempdima\MT@val pt\relax\@nnil
@@ -2248,7 +2271,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
 }
 \def\MT@define@set@key@font#1{%
   \define@key{MT@#1@set}{font}[]{%
-    \global\MT@let@nc{MT@#1list@font@\MT@curr@set@name}\@empty
+    \MT@glet@nc{MT@#1list@font@\MT@curr@set@name}\@empty
     \MT@map@clist@n{##1}{%
       \KV@@sp@def\MT@val{####1}%
       \MT@ifstreq\MT@val*{\def\MT@val{*/*/*/*/*}}\relax
@@ -2262,12 +2285,10 @@ time will almost certainly lead to undesired results. Have your choice!}%
   }%
 }
 \def\MT@get@font#1/#2/#3/#4/#5/#6\@nil{%
-  \MT@ifempty{#1#2#3#4#5}\relax{%
-    \MT@get@font@{#1}{#2}{#3}{#4}{#5}{0}%
-    \ifx\MT@val\relax\def\MT@val{0}\fi
-    \expandafter\g@addto@macro\expandafter\@tempb\expandafter{\MT@val}%
-    \let\MT@val\@tempb
-  }%
+  \MT@get@font@{#1}{#2}{#3}{#4}{#5}{0}%
+  \ifx\MT@val\relax\def\MT@val{0}\fi
+  \expandafter\g@addto@macro\expandafter\@tempb\expandafter{\MT@val}%
+  \let\MT@val\@tempb
 }
 \def\MT@get@font@#1#2#3#4#5#6{%
   \let\@tempb\@empty
@@ -2458,7 +2479,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
       \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}%
-      \global\MT@let@nc{MT@ex@c@\MT@ex@c@name @factor}\@m
+      \MT@glet@nc{MT@ex@c@\MT@ex@c@name @factor}\@m
     \fi
   }%
   \def\MT@permutelist{ex@c}%
@@ -2514,7 +2535,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
 \def\MT@set@named@keys#1#2{%
   \def\x##1name=##2,##3\@nil{%
     \setkeys{#1}{name=##2}%
-    \def\MT@options{##1##3}%
+    \gdef\MT@options{##1##3}%
     \MT@rem@from@clist{name=}\MT@options
   }%
   \x#2,name=,\@nil
@@ -2537,7 +2558,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
       \KV@@sp@def\MT@val{####1}%
       \expandafter\MT@get@range\MT@val--\@nil
       \ifx\MT@val\relax \else
-        \expandafter\MT@xadd\csname MT@tempsize\endcsname
+        \MT@exp@cs\MT@xadd{MT@tempsize}%
            {{{\MT@lower}{\MT@upper}{\MT@curr@set@name}}}%
       \fi
     }%
@@ -2551,15 +2572,14 @@ time will almost certainly lead to undesired results. Have your choice!}%
       \expandafter\MT@get@font@and@size\MT@val/////\@nil
       \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
+      \MT@exp@cs\MT@xaddb
+        {MT@\MT@permutelist @\@tempb\MT@extra@context @sizes}%
         {{{\MT@val}{\m@ne}{\MT@curr@set@name}}}%
     }%
   }%
 }
 \def\MT@get@font@and@size#1/#2/#3/#4/#5/#6\@nil{%
-  \MT@ifempty{#1#2#3#4#5}\relax
-    {\MT@get@font@{#1}{#2}{#3}{#4}{#5}{1}}%
+  \MT@get@font@{#1}{#2}{#3}{#4}{#5}{1}%
 }
 \MT@define@code@key{encoding}{cfg}
 \MT@define@code@key{family}{cfg}
@@ -2590,9 +2610,11 @@ time will almost certainly lead to undesired results. Have your choice!}%
   \define@key{MT@#1@c}{context}[]{\MT@ifempty{##1}\relax{\def\MT@extra@context{##1}}}%
 }
 \MT@requires@pdftex7{
-    \define@key{MT@ex@c}{context}[]{\MT@ifempty{#1}\relax{%
-      \MT@glet\MT@copy@font\MT@copy@font@
-      \def\MT@extra@context{#1}}%
+    \define@key{MT@ex@c}{context}[]{%
+      \MT@ifempty{#1}\relax{%
+        \MT@glet\MT@copy@font\MT@copy@font@
+        \def\MT@extra@context{#1}%
+      }%
     }
     \MT@addto@setup{%
       \define@key{MT@ex@c}{context}[]{%
@@ -2606,6 +2628,21 @@ time will almost certainly lead to undesired results. Have your choice!}%
         \fi
       }
     }
+    \define@key{MT@pr@c}{context}[]{%
+      \MT@ifempty{#1}\relax{%
+        \MT@glet\MT@copy@font\MT@copy@font@
+        \def\MT@extra@context{#1}%
+      }%
+    }
+    \MT@addto@setup{%
+      \define@key{MT@pr@c}{context}[]{%
+        \MT@ifempty{#1}\relax{\def\MT@extra@context{#1}}%
+        \ifx\MT@copy@font\MT@copy@font@\else
+          \MT@warning@nl{If protrusion contexts don't work as expected,
+            \MessageBreak load the package with the `copyfonts' option}%
+        \fi
+      }
+    }
 }{
   \define@key{MT@ex@c}{context}[]{%
     \MT@error{Expansion contexts only work with pdftex 1.40.4\MessageBreak
@@ -2618,31 +2655,31 @@ time will almost certainly lead to undesired results. Have your choice!}%
               Ignoring it and setting values relative to\MessageBreak #1}%
 }
 \define@key{MT@pr@c}{unit}[character]{%
-  \global\MT@let@nc{MT@pr@c@\MT@curr@set@name @unit}\@empty
+  \MT@glet@nc{MT@pr@c@\MT@curr@set@name @unit}\@empty
   \def\@tempa{#1}%
   \MT@ifstreq\@tempa{character}\relax{%
     \MT@ifdimen\@tempa
-      {\global\MT@let@nc{MT@pr@c@\MT@curr@set@name @unit}\@tempa}%
+      {\MT@glet@nc{MT@pr@c@\MT@curr@set@name @unit}\@tempa}%
       {\MT@warn@nodim{character widths}}%
   }%
 }
 \define@key{MT@tr@c}{unit}[1em]{%
-  \global\MT@let@nc{MT@tr@c@\MT@curr@set@name @unit}\@empty
+  \MT@glet@nc{MT@tr@c@\MT@curr@set@name @unit}\@empty
   \def\@tempa{#1}%
   \MT@ifdimen\@tempa
-    {\global\MT@let@nc{MT@tr@c@\MT@curr@set@name @unit}\@tempa}%
+    {\MT@glet@nc{MT@tr@c@\MT@curr@set@name @unit}\@tempa}%
     {\MT@warn@nodim{1em}%
      \MT@gdef@n{MT@tr@c@\MT@curr@set@name @unit}{1em}}%
 }
 \MT@map@clist@n{sp,kn}{%
   \define@key{MT@#1@c}{unit}[space]{%
-    \global\MT@let@nc{MT@#1@c@\MT@curr@set@name @unit}\@empty
+    \MT@glet@nc{MT@#1@c@\MT@curr@set@name @unit}\@empty
     \def\@tempa{##1}%
     \MT@ifstreq\@tempa{character}\relax{%
-      \global\MT@let@nc{MT@#1@c@\MT@curr@set@name @unit}\m@ne
+      \MT@glet@nc{MT@#1@c@\MT@curr@set@name @unit}\m@ne
       \MT@ifstreq\@tempa{space}\relax{%
         \MT@ifdimen\@tempa
-          {\global\MT@let@nc{MT@#1@c@\MT@curr@set@name @unit}\@tempa}%
+          {\MT@glet@nc{MT@#1@c@\MT@curr@set@name @unit}\@tempa}%
           {\MT@warn@nodim{width of space}}%
       }%
     }%
@@ -2671,7 +2708,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
     }
   \else
     \MT@requires@pdftex4{%
-      \global\MT@let@nc{MT@ex@c@\MT@curr@set@name @auto}\@empty
+      \MT@glet@nc{MT@ex@c@\MT@curr@set@name @auto}\@empty
     }\relax
   \fi
 }
@@ -2754,9 +2791,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
         \ifx\@tempa\@empty \else
           \MT@get@slot
           \ifnum\MT@char > \m@ne
-            \expandafter\MT@xadd
-              \csname MT@inh@\MT@listname @\MT@val @\endcsname
-              {{\MT@char}}%
+            \MT@exp@cs\MT@xadd{MT@inh@\MT@listname @\MT@val @}{{\MT@char}}%
           \fi
         \fi
       }%
@@ -2815,8 +2850,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
               /\MT@tempseries
               /\MT@tempshape
               /\MT@ifdefined@c@T\MT@tempsize *}%
-  \def\@tempb{////}%
-  \ifx\@tempa\@tempb \else
+  \MT@ifstreq\@tempa{////}\relax{%
     \ifx\MT@tempencoding\@empty
       \MT@warning{%
         You have to specify an encoding for\MessageBreak
@@ -2828,8 +2862,8 @@ time will almost certainly lead to undesired results. Have your choice!}%
         \MT@ifdefined@n@T{MT@\MT@permutelist @\@tempa\MT@extra@context @sizes}{%
           \MT@map@tlist@c\MT@tempsize\MT@check@rlist
         }%
-        \expandafter\MT@xaddb
-          \csname MT@\MT@permutelist @\@tempa\MT@extra@context @sizes\endcsname
+        \MT@exp@cs\MT@xaddb
+          {MT@\MT@permutelist @\@tempa\MT@extra@context @sizes}%
           \MT@tempsize
       }{%
         \MT@ifdefined@n@T{MT@\MT@permutelist @\@tempa\MT@extra@context}{%
@@ -2842,10 +2876,10 @@ time will almost certainly lead to undesired results. Have your choice!}%
       \MT@xdef@n{MT@\MT@permutelist @\@tempa\MT@extra@context}%
           {\csname MT@\MT@permutelist @name\endcsname}%
     \fi
-  \fi
+  }%
 }
 \def\MT@permute@define#1{%
-  \expandafter\@tempcnta=\csname MT@cnt@#1\endcsname\relax
+  \@tempcnta=\csname MT@cnt@#1\endcsname\relax
   \MT@ifdefined@n@TF{MT@temp#1\the\@tempcnta}%
     {\MT@edef@n{MT@temp#1}{\csname MT@temp#1\the\@tempcnta\endcsname}}%
     {\MT@let@nc{MT@temp#1}\@empty}%
@@ -2865,8 +2899,8 @@ time will almost certainly lead to undesired results. Have your choice!}%
   \def\@tempb{#1}%
   \def\@tempc{#2}%
   \MT@if@false
-  \expandafter\MT@map@tlist@c
-    \csname MT@\MT@permutelist @\@tempa\MT@extra@context @sizes\endcsname
+  \MT@exp@cs\MT@map@tlist@c
+    {MT@\MT@permutelist @\@tempa\MT@extra@context @sizes}%
     \MT@check@range
 }
 \def\MT@check@range#1{\expandafter\MT@check@range@ #1}
@@ -3110,7 +3144,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
   \MT@ifdefined@n@TF{MT@#1@setname}{%
     \MT@info@nl{Using \@nameuse{MT@abbr@#1} set `\@nameuse{MT@#1@setname}'}%
   }{%
-    \global\MT@let@nn{MT@#1@setname}{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}'}%
   }%
 }
@@ -3129,7 +3163,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
         \@tempcnta=\m@ne
         \MT@ifstreq\MT@val{true}{%
           \MT@checksetup{#1}{%
-            \expandafter\@tempcnta=\csname MT@\@tempb @level\endcsname
+            \@tempcnta=\csname MT@\@tempb @level\endcsname
             \MT@info{Enabling #1
                     (level \number\csname MT@\@tempb @level\endcsname)}%
           }%
@@ -3203,15 +3237,16 @@ 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\relax
+                                  \else\let\MT@tracking\MT@tracking@\fi}
   \MT@define@optionX@{spacing}{\pdfadjustinterwordglue\@tempcnta}
   \MT@define@optionX@{kerning}{\pdfprependkern\@tempcnta
                                \pdfappendkern \@tempcnta}
-}{
-  \define@key{MTX}{tracking}[true]{\MT@warning{Ignoring tracking setup}}
-  \define@key{MTX}{kerning}[true]{\MT@warning{Ignoring kerning setup}}
-  \define@key{MTX}{spacing}[true]{\MT@warning{Ignoring spacing setup}}
+  \@gobble
+}\@firstofone
+{\define@key{MTX}{tracking}[true]{\MT@warning{Ignoring tracking setup}}
+ \define@key{MTX}{kerning}[true]{\MT@warning{Ignoring kerning setup}}
+ \define@key{MTX}{spacing}[true]{\MT@warning{Ignoring spacing setup}}
 }
 \define@key{MTX}{activate}[true]{%
   \setkeys{MTX}{protrusion={#1}}%
@@ -3359,7 +3394,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
                 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
-                  Set up for expansion contexts (using font copies)\fi}
+                  Using font copies for contexts\fi}
     \def\MT@check@step#1{%
       \@tempcnta=\csname MT@#1\endcsname
       \divide\@tempcnta \MT@step
@@ -3398,20 +3433,20 @@ time will almost certainly lead to undesired results. Have your choice!}%
       \MT@info@nl{No tracking}
     \fi
     \ifMT@spacing
-      \edef\MT@active@features{\MT@active@features,sp}
-      \pdfadjustinterwordglue\@ne
-      \MT@info@nl{Adjustment of interword spacing enabled}
-      \MT@check@active@set{sp}
+        \edef\MT@active@features{\MT@active@features,sp}
+        \pdfadjustinterwordglue\@ne
+        \MT@info@nl{Adjustment of interword spacing enabled}
+        \MT@check@active@set{sp}
     \else
       \let\MT@spacing\relax
       \MT@info@nl{No adjustment of interword spacing}
     \fi
     \ifMT@kerning
-      \edef\MT@active@features{\MT@active@features,kn}
-      \pdfprependkern\@ne
-      \pdfappendkern\@ne
-      \MT@info@nl{Adjustment of character kerning enabled}
-      \MT@check@active@set{kn}
+        \edef\MT@active@features{\MT@active@features,kn}
+        \pdfprependkern\@ne
+        \pdfappendkern\@ne
+        \MT@info@nl{Adjustment of character kerning enabled}
+        \MT@check@active@set{kn}
     \else
       \let\MT@kerning\relax
       \MT@info@nl{No adjustment of character kerning}
@@ -3493,7 +3528,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
   \MT@ifdefined@n@TF{MT@babel@#1}{%
     \MT@vinfo{*** Changing to language context `#1'\MessageBreak\on@line}%
     \expandafter\MT@exp@one@n\expandafter\microtypecontext
-        \csname MT@babel@#1\endcsname
+      \csname MT@babel@#1\endcsname
   }{%
     \microtypecontext{protrusion=,expansion=,spacing=,kerning=}%
   }%
diff --git a/Master/texmf-dist/tex/latex/microtype/mt-blg.cfg b/Master/texmf-dist/tex/latex/microtype/mt-blg.cfg
index ef6b547b6f7..2173664b252 100644
--- a/Master/texmf-dist/tex/latex/microtype/mt-blg.cfg
+++ b/Master/texmf-dist/tex/latex/microtype/mt-blg.cfg
@@ -132,7 +132,7 @@
 \SetProtrusion
    [ name     = blg-it-T1,
      load     = blg-T1   ]
-   { encoding = {T1},
+   { encoding = T1,
      family   = blg,
      shape    = it       }
    {
diff --git a/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg b/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg
index bcff01a082b..c08aa8438a1 100644
--- a/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg
+++ b/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg
@@ -227,7 +227,7 @@
 \SetProtrusion
    [ name     = ptm-it-T1,
      load     = ptm-it   ]
-   { encoding = {T1},
+   { encoding = T1,
      family   = {ptm,ptmx,ptmj},
      shape    = {it,sl}  }
    {
diff --git a/Master/texmf-dist/tex/latex/microtype/mt-ugm.cfg b/Master/texmf-dist/tex/latex/microtype/mt-ugm.cfg
index e65c09de9e0..37eccd885fd 100644
--- a/Master/texmf-dist/tex/latex/microtype/mt-ugm.cfg
+++ b/Master/texmf-dist/tex/latex/microtype/mt-ugm.cfg
@@ -158,7 +158,7 @@
 \SetProtrusion
    [ name     = ugm-it-T1,
      load     = ugm-it   ]
-   { encoding = {T1},
+   { encoding = T1,
      family   = ugm,
      shape    = it       }
    {