summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/microtype
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-11-13 15:50:38 +0000
committerKarl Berry <karl@freefriends.org>2009-11-13 15:50:38 +0000
commit9f6934cabc90af62c40c7ed913cf91f6a9c6f61a (patch)
tree5edeca5cb0efc25d9dd0fe3d5957a147e3e6f88e /Master/texmf-dist/tex/latex/microtype
parentc0010265e0a3454faeaec5801d0cb199d0c366fc (diff)
microtype 2.3e (10nov09)
git-svn-id: svn://tug.org/texlive/trunk@16007 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/microtype')
-rw-r--r--Master/texmf-dist/tex/latex/microtype/letterspace.sty56
-rw-r--r--Master/texmf-dist/tex/latex/microtype/microtype.cfg163
-rw-r--r--Master/texmf-dist/tex/latex/microtype/microtype.sty292
-rw-r--r--Master/texmf-dist/tex/latex/microtype/mt-cmr.cfg101
-rw-r--r--Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg1
5 files changed, 429 insertions, 184 deletions
diff --git a/Master/texmf-dist/tex/latex/microtype/letterspace.sty b/Master/texmf-dist/tex/latex/microtype/letterspace.sty
index dfdc5056399..7d0a1af6b45 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}
- [2009/03/27 v2.3d
+ [2009/11/09 v2.3e
Robust letterspacing
(RS)]
\def\MT@MT
@@ -210,17 +210,17 @@
\def\lsstyle{\pdfstringdefWarn\lsstyle}%
\def\textls#1#{\pdfstringdefWarn\textls}%
}%
- }
+ }%
}\relax
\MT@requires@latex2{
\MT@with@package@T{soul}{%
\soulregister\lsstyle 0%
\soulregister\textls 1%
- }
+ }%
}{\ifx\SOUL@\@undefined\else
\soulregister\lsstyle 0%
\soulregister\textls 1%
- \fi}
+ \fi}%
}
\let\MT@tracking
\relax
@@ -251,11 +251,11 @@
\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
+ \aftergroup\aftergroup\aftergroup\MT@ls@aftergroup
\fi
\fi
}
+\def\MT@ls@aftergroup{\MT@set@curr@ok\MT@ls@outer@k}
\MT@requires@latex2{
\def\MT@set@lsfont{\MT@exp@two@c\let\font@name\MT@lsfont}
\DeclareRobustCommand\lsstyle{%
@@ -339,21 +339,21 @@
\def\MT@ls@outer@k{\ifhmode\kern\MT@outer@kern\relax\fi}
\MT@requires@latex2{
\MT@addto@setup{%
- \@ifpackageloaded{CJK}{
- \@ifpackagelater{CJK}{2006/10/17} % 4.7.0
- {\def\MT@orig@pickupfont{\CJK@ifundefined\CJK@plane}}
- {\def\MT@orig@pickupfont{\@ifundefined{CJK@plane}}}
+ \@ifpackageloaded{CJK}{%
+ \@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}}
- \@ifpackageloaded{CJKutf8}
- {\@ifpackagelater{CJKutf8}{2008/05/22} % 4.8.0
- {\ifpdf\expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi}
- {\@firstoftwo}}
- {\@firstoftwo}
+ {{\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}}}
+ \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}%
@@ -362,23 +362,23 @@
\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}
- }
+ \csname \curr@fontshape/\f@size/\CJK@plane\endcsname}\fi}}}%
+ }{%
+ \def\MT@orig@pickupfont{\expandafter\ifx\font@name\relax\define@newfont\fi}%
+ }%
\ifx\pickup@font\MT@orig@pickupfont \else
\MT@warning@nl{%
Command \string\pickup@font\space is not defined as expected.%
\MessageBreak Patching it anyway. Some things may break%
- }
+ }%
\fi
- \g@addto@macro\pickup@font{\begingroup}
- \MT@with@package@T{trace}{\g@addto@macro\pickup@font{\conditionally@traceoff}}
+ \g@addto@macro\pickup@font{\begingroup}%
+ \MT@with@package@T{trace}{\g@addto@macro\pickup@font{\conditionally@traceoff}}%
\g@addto@macro\pickup@font{%
\escapechar\m@ne
\MT@tracking
\endgroup
- }
+ }%
}
}\relax
\MT@requires@latex1{
@@ -430,19 +430,19 @@
processing program (dvips, dvipdfm(x), ...) is\MessageBreak
able to create the virtual fonts on the fly}%
\MT@glet\MT@warn@tracking@DVI\relax
- }
+ }%
\else
\def\MT@warn@tracking@DVI{%
\ifnum\pdfprotrudechars<\@ne \global\pdfprotrudechars\@ne \fi
\MT@glet\MT@warn@tracking@DVI\relax
- }
+ }%
\fi
\ifnum\MT@letterspace=\m@ne
\let\MT@letterspace\MT@letterspace@default
\else
\MT@ls@too@large\MT@letterspace
\fi
- }
+ }%
\MT@requires@latex1{
\AtBeginDocument{\MT@setup@ \MT@glet\MT@setup@\@empty}
}\relax
diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.cfg b/Master/texmf-dist/tex/latex/microtype/microtype.cfg
index 76a859bc1d7..83115070e7f 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}
- [2009/03/27 v2.3d
+ [2009/11/09 v2.3e
microtype main configuration file
(RS)]
@@ -50,37 +50,37 @@
{ }
\DeclareMicrotypeSet{allmath}
- { encoding = {OT1,T1,LY1,OT4,QX,T5,TS1,OML,OMS,U} }
+ { encoding = {OT1,T1,T2A,LY1,OT4,QX,T5,TS1,OML,OMS,U} }
\DeclareMicrotypeSet{alltext}
- { encoding = {OT1,T1,LY1,OT4,QX,T5,TS1} }
+ { encoding = {OT1,T1,T2A,LY1,OT4,QX,T5,TS1} }
\DeclareMicrotypeSet{basicmath}
- { encoding = {OT1,T1,LY1,OT4,QX,T5,OML,OMS},
+ { encoding = {OT1,T1,T2A,LY1,OT4,QX,T5,OML,OMS},
family = {rm*,sf*},
series = {md*},
size = {normalsize,footnotesize,small,large}
}
\DeclareMicrotypeSet{basictext}
- { encoding = {OT1,T1,LY1,OT4,QX,T5},
+ { encoding = {OT1,T1,T2A,LY1,OT4,QX,T5},
family = {rm*,sf*},
series = {md*},
size = {normalsize,footnotesize,small,large}
}
\DeclareMicrotypeSet{smallcaps}
- { encoding = {OT1,T1,LY1,OT4,QX,T5,TS1},
- shape = {sc}
+ { encoding = {OT1,T1,T2A,LY1,OT4,QX,T5,TS1},
+ shape = {sc*}
}
\DeclareMicrotypeSet{footnotesize}
- { encoding = {OT1,T1,LY1,OT4,QX,T5,TS1},
+ { encoding = {OT1,T1,T2A,LY1,OT4,QX,T5,TS1},
size = {-small}
}
\DeclareMicrotypeSet{scriptsize}
- { encoding = {OT1,T1,LY1,OT4,QX,T5,TS1},
+ { encoding = {OT1,T1,T2A,LY1,OT4,QX,T5,TS1},
size = {-footnotesize}
}
@@ -304,7 +304,7 @@
\SetTracking
[ name = default,
no ligatures = {f} ]
- { encoding = {OT1,T1,LY1,OT4,QX} }
+ { encoding = {OT1,T1,T2A,LY1,OT4,QX} }
{ }
%%% -----------------------------------------------------------------------
@@ -343,6 +343,68 @@
}
\SetExpansion
+ [ name = T2A ]
+ { encoding = T2A }
+ {
+ A = 500, a = 700,
+ B = 700, b = 700,
+ C = 700, c = 700,
+ D = 500, d = 700,
+ E = 700, e = 700,
+ F = 700,
+ G = 500, g = 700,
+ H = 700, h = 700,
+ K = 700, k = 700,
+ M = 700, m = 700,
+ N = 700, n = 700,
+ O = 500, o = 700,
+ P = 700, p = 700,
+ Q = 500, q = 700,
+ R = 700,
+ S = 700, s = 700,
+ U = 700, u = 700,
+ W = 700, w = 700,
+ Z = 700, z = 700,
+ 2 = 700,
+ 3 = 700,
+ 6 = 700,
+ 8 = 700,
+ 9 = 700,
+ \CYRA = 500, \cyra = 700,
+ \CYRB = 700, \cyrb = 700,
+ \CYRV = 700, \cyrv = 700,
+ \CYRG = 700, \cyrg = 700,
+ \CYRD = 700, \cyrd = 700,
+ \CYRE = 700, \cyre = 700,
+ \CYRZH = 700, \cyrzh = 700,
+ \CYRZ = 700, \cyrz = 700,
+ \CYRI = 700, \cyri = 700,
+ \CYRISHRT = 700, \cyrishrt = 700,
+ \CYRK = 700, \cyrk = 700,
+ \CYRL = 700, \cyrl = 700,
+ \CYRM = 700, \cyrm = 700,
+ \CYRN = 700, \cyrn = 700,
+ \CYRO = 500, \cyro = 700,
+ \CYRP = 700, \cyrp = 700,
+ \CYRR = 700, \cyrr = 700,
+ \CYRS = 700, \cyrs = 700,
+ \CYRT = 700, \cyrt = 700,
+ \CYRU = 700, \cyru = 700,
+ \CYRF = 700, \cyrf = 700,
+ \CYRH = 700, \cyrh = 700,
+ \CYRC = 700, \cyrc = 700,
+ \CYRCH = 700, \cyrch = 700,
+ \CYRSH = 700, \cyrsh = 700,
+ \CYRSHCH = 700, \cyrshch = 700,
+ \CYRHRDSN = 700, \cyrhrdsn = 700,
+ \CYRERY = 700, \cyrery = 700,
+ \CYRSFTSN = 700, \cyrsftsn = 700,
+ \CYREREV = 700, \cyrerev = 700,
+ \CYRYU = 700, \cyryu = 700,
+ \CYRYA = 700, \cyrya = 700
+ }
+
+\SetExpansion
[ name = T5 ]
{ encoding = T5 }
{
@@ -377,10 +439,9 @@
\SetProtrusion
[ name = default ]
- { encoding = OT1 }
+ { }
{
A = {50,50},
- \AE = {50, },
F = { ,50},
J = {50, },
K = { ,50},
@@ -419,10 +480,19 @@
}
\SetProtrusion
+ [ name = OT1-default,
+ load = default ]
+ { encoding = OT1 }
+ {
+ \AE = {50, },
+ }
+
+\SetProtrusion
[ name = T1-default,
load = default ]
{ encoding = {T1,LY1} }
{
+ \AE = {50, },
_ = {100,100},
\textbackslash = {100,200},
\quotesinglbase = {400,400}, \quotedblbase = {400,400},
@@ -434,10 +504,34 @@
}
\SetProtrusion
+ [ name = T2A-default,
+ load = default ]
+ { encoding = T2A,
+ }
+ {
+ \CYRA = {50,50},
+ \CYRG = { ,50},
+ \CYRK = { ,50},
+ \CYRT = {50,50},
+ \CYRH = {50,50},
+ \CYRU = {50,50},
+ \cyrk = { ,50},
+ \cyrg = { ,50},
+ \cyrh = {50,50},
+ \cyru = {50,50},
+ _ = {100,100},
+ \textbackslash = {100,200}, \quotedblbase = {400,400},
+ \guillemotleft = {200,200}, \guillemotright = {200,200},
+ \textbraceleft = {400,200}, \textbraceright = {200,400},
+ \textless = {200,100}, \textgreater = {100,200}
+ }
+
+\SetProtrusion
[ name = QX-default,
load = default ]
{ encoding = QX }
{
+ \AE = {50, },
{=} = {100,100},
\textunderscore = {100,100},
\textbackslash = {100,200},
@@ -489,6 +583,18 @@
}
\SetProtrusion
+ [ name = T2A-it-default,
+ load = OT1-it ]
+ { encoding = T2A,
+ shape = {it,sl} }
+ {
+ _ = { ,100},
+ \textbackslash = {100,200}, \quotedblbase = {400,500},
+ \guillemotleft = {300,300}, \guillemotright = {300,300},
+ \textbraceleft = {200,100}, \textbraceright = {200,200},
+ }
+
+\SetProtrusion
[ name = QX-it-default,
load = OT1-it ]
{ encoding = {QX},
@@ -539,6 +645,18 @@
}
\SetProtrusion
+ [ name = T2A-sc,
+ load = T2A-default ]
+ { encoding = T2A,
+ shape = sc }
+ {
+ \cyra = {50,50},
+ \cyrg = { ,50},
+ \cyrt = {50,50},
+ \cyry = { ,50}
+ }
+
+\SetProtrusion
[ name = QX-sc,
load = QX-default ]
{ encoding = QX,
@@ -600,6 +718,25 @@
}
\SetExtraSpacing
+ [ name = T2A,
+ load = default ]
+ { encoding = T2A,
+ family = cmr }
+ {
+ \cyrg = { ,-300,300},
+ \cyrb = { ,-200,200},
+ \cyrk = { ,-200,200},
+ \cyrs = { ,-100,100},
+ \cyrr = { ,-100,100},
+ \cyrh = { ,-100,100},
+ \cyru = { ,-100,100},
+ \cyrt = { , 50, -50},
+ \cyrp = { , 50, -50},
+ \cyri = { , 50, -50},
+ \cyrishrt = { , 50, -50},
+ }
+
+\SetExtraSpacing
[ name = nonfrench-cmr,
load = default,
context = nonfrench ]
@@ -633,7 +770,7 @@
\SetExtraKerning
[ name = empty ]
- { encoding = {OT1,T1,LY1,OT4,QX,T5,TS1} }
+ { encoding = {OT1,T1,T2A,LY1,OT4,QX,T5,TS1} }
{ }
\SetExtraKerning
diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.sty b/Master/texmf-dist/tex/latex/microtype/microtype.sty
index 4909a437a97..b84d3a598f1 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}
- [2009/03/27 v2.3d
+ [2009/11/09 v2.3e
Micro-typography with pdfTeX
(RS)]
\def\MT@MT
@@ -297,11 +297,15 @@
\fi
}
\endgroup
+\MT@requires@luatex{
+ \MT@ifdefined@c@TF\luatexluaescapestring\relax
+ {\let\luatexluaescapestring\luaescapestring}
+}\relax
\MT@requires@pdftex6{
\MT@requires@luatex{
\def\MT@ifint#1{%
\csname \MT@lua{
- if string.find("\luaescapestring{#1}","^-*[0-9]+ *$")
+ if string.find("\luatexluaescapestring{#1}","^-*[0-9]+ *$")
then tex.write("@firstoftwo")
else tex.write("@secondoftwo")
end}%
@@ -329,8 +333,8 @@
\MT@requires@luatex{
\def\MT@ifdimen#1{%
\csname \MT@lua{
- if (string.find("\luaescapestring{#1}","^-*[0-9]+(\@percentchar a*) *$") or
- string.find("\luaescapestring{#1}","^-*[0-9]*[.,][0-9]+(\@percentchar a*) *$"))
+ if (string.find("\luatexluaescapestring{#1}","^-*[0-9]+(\@percentchar a*) *$") or
+ string.find("\luatexluaescapestring{#1}","^-*[0-9]*[.,][0-9]+(\@percentchar a*) *$"))
then tex.write("@firstoftwo")
else tex.write("@secondoftwo")
end}%
@@ -369,7 +373,7 @@
\MT@requires@luatex{
\def\MT@ifstreq#1#2{%
\csname \MT@lua{
- if "\luaescapestring{#1}" == "\luaescapestring{#2}"
+ if "\luatexluaescapestring{#1}" == "\luatexluaescapestring{#2}"
then tex.write("@firstoftwo")
else tex.write("@secondoftwo")
end}%
@@ -614,7 +618,7 @@
The `pdfcprot' package provides an interface to character protrusion.\MessageBreak
So does the `\MT@MT' package. Using both packages at the same\MessageBreak
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@if@false
@@ -633,7 +637,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
Should you receive warnings about unknown slot\MessageBreak
numbers, try upgrading the `csquotes' package}%
}%
- }
+ }%
\MT@if@false
\MT@with@package@T{hyperref}{%
\pdfstringdefDisableCommands{%
@@ -644,7 +648,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\def\textls#1#{\pdfstringdefWarn\textls}%
}%
\MT@if@true
- }
+ }%
\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}{%
@@ -657,11 +661,11 @@ time will almost certainly lead to undesired results. Have your choice!}%
\catcode`\\\z@
\let\lst@ProcessLetter\@empty
}%
- }
+ }%
\MT@with@package@T{soul}{%
\soulregister\lsstyle 0%
\soulregister\textls 1%
- }
+ }%
\MT@with@package@T{pinyin}{%
\let\MT@orig@py@macron\py@macron
\@ifpackagelater{pinyin}{2005/08/11}{% 4.6.0
@@ -675,7 +679,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\MT@orig@py@macron{#1}%
\let\pickup@font\MT@pickupfont}%
}%
- }
+ }%
}
\expandafter\ifx\the\font\nullfont\normalfont\fi
\def\MT@setupfont{\MT@setupfont@hook}
@@ -830,27 +834,27 @@ time will almost certainly lead to undesired results. Have your choice!}%
\def\MT@protrusion{\MT@maybe@do{pr}}
\def\MT@set@pr@codes{%
\MT@if@list@exists{%
- \MT@get@font@dimen@six
- \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}%
- \expandafter\MT@set@codes\@tempc,\relax,%
+ \MT@get@font@dimen@six{%
+ \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}%
+ \expandafter\MT@set@codes\@tempc,\relax,}%
}\MT@reset@pr@codes
}
-\def\MT@gobble@settings#1\@tempc,\relax,{}
\def\MT@get@font@dimen@six{%
\ifnum\fontdimen6\MT@font=\z@
\MT@warning@nl{%
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
+ \expandafter\@gobble
\else
\edef\MT@dimen@six{\number\fontdimen6\MT@font}%
+ \expandafter\@firstofone
\fi
}
\def\MT@set@all@pr#1#2{%
@@ -1050,21 +1054,21 @@ time will almost certainly lead to undesired results. Have your choice!}%
\MT@ifdefined@n@T\@tempa\MT@set@inputenc@
}
\MT@addto@setup{%
- \@ifpackageloaded{inputenc}{
- \@ifpackagelater{inputenc}{2006/02/22}{
+ \@ifpackageloaded{inputenc}{%
+ \@ifpackagelater{inputenc}{2006/02/22}{%
\def\MT@set@inputenc@{%
\MT@ifstreq\inputencodingname{\csname\@tempa\endcsname}\relax
\MT@load@inputenc
- }
- }{
+ }%
+ }{%
\let\MT@set@inputenc@\MT@load@inputenc
- }
- }{
+ }%
+ }{%
\def\MT@set@inputenc@{%
\MT@warning@nl{Key `inputenc' used in \MT@curr@list@name, but the `inputenc'
\MessageBreak package isn't loaded. Ignoring input encoding}%
- }
- }
+ }%
+ }%
}
\def\MT@load@inputenc{%
\MT@cfg@catcodes
@@ -1217,15 +1221,15 @@ time will almost certainly lead to undesired results. Have your choice!}%
\def\MT@spacing{\MT@maybe@do{sp}}
\def\MT@set@sp@codes{%
\MT@if@list@exists{%
- \MT@get@font@dimen@six
- \MT@get@opt
- \MT@reset@sp@codes
- \MT@get@inh@list
- \MT@set@inputenc{c}%
- \MT@load@list\MT@sp@c@name
- \MT@set@listname
- \MT@let@cn\@tempc{MT@sp@c@\MT@sp@c@name}%
- \expandafter\MT@set@codes\@tempc,\relax,%
+ \MT@get@font@dimen@six{%
+ \MT@get@opt
+ \MT@reset@sp@codes
+ \MT@get@inh@list
+ \MT@set@inputenc{c}%
+ \MT@load@list\MT@sp@c@name
+ \MT@set@listname
+ \MT@let@cn\@tempc{MT@sp@c@\MT@sp@c@name}%
+ \expandafter\MT@set@codes\@tempc,\relax,}%
}\MT@reset@sp@codes
}
\def\MT@sp@split@val#1,#2,#3\relax{%
@@ -1289,15 +1293,15 @@ time will almost certainly lead to undesired results. Have your choice!}%
\def\MT@kerning{\MT@maybe@do{kn}}
\def\MT@set@kn@codes{%
\MT@if@list@exists{%
- \MT@get@font@dimen@six
- \MT@get@opt
- \MT@reset@kn@codes
- \MT@get@inh@list
- \MT@set@inputenc{c}%
- \MT@load@list\MT@kn@c@name
- \MT@set@listname
- \MT@let@cn\@tempc{MT@kn@c@\MT@kn@c@name}%
- \expandafter\MT@set@codes\@tempc,\relax,%
+ \MT@get@font@dimen@six{%
+ \MT@get@opt
+ \MT@reset@kn@codes
+ \MT@get@inh@list
+ \MT@set@inputenc{c}%
+ \MT@load@list\MT@kn@c@name
+ \MT@set@listname
+ \MT@let@cn\@tempc{MT@kn@c@\MT@kn@c@name}%
+ \expandafter\MT@set@codes\@tempc,\relax,}%
}\MT@reset@kn@codes
}
\def\MT@kn@split@val#1,#2\relax{%
@@ -1362,7 +1366,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\MT@tracking@
\def\MT@set@tr@codes{%
\MT@vinfo{Tracking font `\MT@@font'\on@line}%
- \MT@get@font@dimen@six
+ \MT@get@font@dimen@six{%
\MT@if@list@exists
\MT@get@tr@opt
\relax
@@ -1397,7 +1401,6 @@ time will almost certainly lead to undesired results. Have your choice!}%
\aftergroup\MT@set@curr@ls
\MT@outer@space=\csname MT@outer@space\expandafter\string\font@name\endcsname\relax
\xdef\MT@set@curr@os{\MT@outer@space=\the\MT@outer@space\relax}%
- \aftergroup\aftergroup\aftergroup\MT@set@curr@os
\MT@tr@outer@l
\ifx\MT@ls@adjust\@empty
\MT@outer@kern=-\dimexpr\MT@letterspace@ sp * \fontdimen6\font@name/2000\relax
@@ -1410,10 +1413,16 @@ time will almost certainly lead to undesired results. Have your choice!}%
\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
+ \aftergroup\aftergroup\aftergroup\MT@ls@aftergroup
\fi
+ }%
}
+\MT@addto@setup{%
+ \@ifpackageloaded{tikz}
+ {\def\MT@ls@aftergroup{%
+ \ifnum\tikz@expandcount>\z@ \else
+ \MT@set@curr@os\MT@set@curr@ok\expandafter\MT@tr@outer@r\fi}}
+ {\def\MT@ls@aftergroup{\MT@set@curr@os\MT@set@curr@ok\MT@tr@outer@r}}}
\def\MT@get@tr@opt{%
\MT@set@listname
\MT@ifdefined@n@T{MT@tr@c@\MT@tr@c@name}{%
@@ -1560,19 +1569,18 @@ 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@{%
- \ifmmode
- \def\MT@temp*{}%
- \else
+ \def\MT@temp*{}%
+ \ifmmode \else
\ifnum\currentgrouptype=10 \else
\def\MT@temp*##1{\ifhmode\hskip\MT@outer@space
\fi}%
\ifcat\egroup\noexpand\MT@tr@outer@next
\ifhmode\unkern\fi\egroup
- \MT@set@curr@ok
- \MT@set@curr@os
+ \MT@set@curr@ok \MT@set@curr@os
\def\MT@temp*{\afterassignment\MT@tr@outer@r\let\MT@temp=}%
\else
\ifx\maybe@ic\MT@tr@outer@next
+ \MT@set@curr@ok \MT@set@curr@os
\def\MT@temp*{\afterassignment\MT@tr@outer@icr\let\MT@temp=}%
\else
\ifx\check@icr\MT@tr@outer@next
@@ -1589,7 +1597,8 @@ time will almost certainly lead to undesired results. Have your choice!}%
\ifx\ \MT@tr@outer@next \else
\ifx\space\MT@tr@outer@next \else
\ifx\@xobeysp\MT@tr@outer@next \else
- \def\MT@temp*{\ifdim\MT@outer@kern=\z@\else\MT@ls@outer@k\fi}%
+ \def\MT@temp*{\ifdim\MT@outer@kern=\z@\else\MT@ls@outer@k
+ \fi}%
\let\MT@tr@outer@next\relax
\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
\MT@temp*%
@@ -2051,21 +2060,21 @@ time will almost certainly lead to undesired results. Have your choice!}%
\let\MT@font@list\@empty
\let\MT@font\@empty
\MT@addto@setup{%
- \@ifpackageloaded{CJK}{
- \@ifpackagelater{CJK}{2006/10/17} % 4.7.0
- {\def\MT@orig@pickupfont{\CJK@ifundefined\CJK@plane}}
- {\def\MT@orig@pickupfont{\@ifundefined{CJK@plane}}}
+ \@ifpackageloaded{CJK}{%
+ \@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}}
- \@ifpackageloaded{CJKutf8}
- {\@ifpackagelater{CJKutf8}{2008/05/22} % 4.8.0
- {\ifpdf\expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi}
- {\@firstoftwo}}
- {\@firstoftwo}
+ {{\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}}}
+ \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}%
@@ -2074,10 +2083,10 @@ time will almost certainly lead to undesired results. Have your choice!}%
\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}
- }
+ \csname \curr@fontshape/\f@size/\CJK@plane\endcsname}\fi}}}%
+ }{%
+ \def\MT@orig@pickupfont{\expandafter\ifx\font@name\relax\define@newfont\fi}%
+ }%
\ifx\pickup@font\MT@orig@pickupfont \else
\MT@warning@nl{%
Command \string\pickup@font\space is not defined as expected.%
@@ -2085,10 +2094,10 @@ time will almost certainly lead to undesired results. Have your choice!}%
.\MessageBreak Double-check whether micro-typography is indeed%
\MessageBreak applied to the document.%
\MessageBreak (Hint: Turn on `verbose' mode)%
- }
+ }%
\fi
- \g@addto@macro\pickup@font{\begingroup}
- \MT@with@package@T{trace}{\g@addto@macro\pickup@font{\conditionally@traceoff}}
+ \g@addto@macro\pickup@font{\begingroup}%
+ \MT@with@package@T{trace}{\g@addto@macro\pickup@font{\conditionally@traceoff}}%
\g@addto@macro\pickup@font{%
\escapechar\m@ne
\MT@let@cn\MT@font{MT@subst@\expandafter\string\font@name}%
@@ -2101,17 +2110,17 @@ time will almost certainly lead to undesired results. Have your choice!}%
\fi
\MT@setupfont
\endgroup
- }
+ }%
\let\MT@pickupfont\pickup@font
\g@addto@macro\do@subst@correction
{\edef\MT@font{\csname\curr@fontshape/\f@size\endcsname}%
- \MT@glet@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
\MT@orig@add@accent{#1}{#2}%
\let\pickup@font\MT@pickupfont
- }
+ }%
}
\def\MT@check@font{\MT@exp@one@n\MT@in@clist\MT@font\MT@font@list}
\def\MT@register@subst@font{\xdef\MT@font@list{\MT@font@list\font@name,}}
@@ -2706,7 +2715,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
{Either move the settings inside the preamble,\MessageBreak
or load the package with the `copyfonts' option.}%
\fi
- }
+ }%
}
\define@key{MT@pr@c}{context}[]{%
\MT@ifempty{#1}\relax{%
@@ -2721,7 +2730,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\MT@warning@nl{If protrusion contexts don't work as expected,
\MessageBreak load the package with the `copyfonts' option}%
\fi
- }
+ }%
}
}
}{
@@ -3373,16 +3382,16 @@ time will almost certainly lead to undesired results. Have your choice!}%
}
\def\MT@getkey#1=#2\@nil{#1}
\MT@ProcessOptionsWithKV{MT}
-\MT@addto@setup{
+\MT@addto@setup{%
\ifMT@draft
\MT@warning@nl{`draft' option active.\MessageBreak
Disabling all micro-typographic extensions.\MessageBreak
- This might lead to different line and page breaks}
+ This might lead to different line and page breaks}%
\let\MT@setupfont\relax
- \renewcommand*\LoadMicrotypeFile[1]{}
- \renewcommand*\microtypesetup[1]{}
- \renewcommand*\microtypecontext[1]{}
- \renewcommand*\lsstyle{}
+ \renewcommand*\LoadMicrotypeFile[1]{}%
+ \renewcommand*\microtypesetup[1]{}%
+ \renewcommand*\microtypecontext[1]{}%
+ \renewcommand*\lsstyle{}%
\else
\ifnum\pdfoutput<\@ne
\ifMT@opt@expansion \else
@@ -3394,16 +3403,16 @@ time will almost certainly lead to undesired results. Have your choice!}%
\ifx\MT@copy@font\relax\else \MT@info@nl{Using font copies for contexts}\fi
\MT@map@tlist@c\MT@font@sets\MT@fix@font@set
\ifMT@protrusion
- \edef\MT@active@features{\MT@active@features,pr}
+ \edef\MT@active@features{\MT@active@features,pr}%
\pdfprotrudechars\MT@pr@level
\MT@info@nl{Character protrusion enabled (level \number\MT@pr@level)%
\ifnum\MT@pr@factor=\MT@factor@default \else,\MessageBreak
factor: \number\MT@pr@factor\fi
- \ifx\MT@pr@unit\@empty \else,\MessageBreak unit: \MT@pr@unit\fi}
- \MT@check@active@set{pr}
+ \ifx\MT@pr@unit\@empty \else,\MessageBreak unit: \MT@pr@unit\fi}%
+ \MT@check@active@set{pr}%
\else
\let\MT@protrusion\relax
- \MT@info@nl{No character protrusion}
+ \MT@info@nl{No character protrusion}%
\fi
\ifMT@expansion
\ifnum\MT@stretch=\m@ne
@@ -3412,7 +3421,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\ifnum\MT@shrink=\m@ne
\let\MT@shrink\MT@stretch
\fi
- \MT@requires@pdftex6{\def\MT@step{1 }}{
+ \MT@requires@pdftex6{\def\MT@step{1 }}{%
\ifnum\MT@step=\m@ne
\ifnum\MT@stretch>\MT@shrink
\ifnum\MT@shrink=\z@
@@ -3436,7 +3445,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\fi
\fi
\ifnum\@tempcnta=\z@ \@tempcnta=\@ne \fi
- \edef\MT@step{\number\@tempcnta\space}}
+ \edef\MT@step{\number\@tempcnta\space}}%
\let\MT@auto\@empty
\ifMT@auto
\MT@requires@pdftex4{%
@@ -3447,11 +3456,11 @@ time will almost certainly lead to undesired results. Have your choice!}%
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.}
+ off expansion\MessageBreak completely.}%
\fi
\MT@autofalse
\else
- \def\MT@auto{autoexpand}
+ \def\MT@auto{autoexpand}%
\fi
}{%
\MT@error{%
@@ -3459,14 +3468,14 @@ time will almost certainly lead to undesired results. Have your choice!}%
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.}
+ completely, or upgrade pdftex to version 1.20 or newer.}%
\MT@autofalse
- \def\MT@auto{1000 }
- }
+ \def\MT@auto{1000 }%
+ }%
\else
- \MT@requires@pdftex4\relax{
- \def\MT@auto{1000 }
- }
+ \MT@requires@pdftex4\relax{%
+ \def\MT@auto{1000 }%
+ }%
\fi
\ifMT@selected
\let\MT@set@ex@codes\MT@set@ex@codes@s
@@ -3477,7 +3486,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\ifnum\MT@shrink=\z@
\MT@warning@nl{%
Both the stretch and shrink limit are set to zero.\MessageBreak
- Disabling font expansion}
+ Disabling font expansion}%
\MT@expansionfalse
\fi
\fi
@@ -3488,7 +3497,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\MT@info@nl{\ifMT@auto A\else Non-a\fi utomatic font expansion enabled
(level \number\MT@ex@level),\MessageBreak
stretch: \number\MT@stretch, shrink: \number\MT@shrink,
- step: \number\MT@step, \ifMT@selected\else non-\fi selected}
+ step: \number\MT@step, \ifMT@selected\else non-\fi selected}%
\def\MT@check@step#1{%
\@tempcnta=\csname MT@#1\endcsname
\divide\@tempcnta \MT@step
@@ -3496,65 +3505,66 @@ time will almost certainly lead to undesired results. Have your choice!}%
\ifnum\@tempcnta=\csname MT@#1\endcsname\else
\MT@warning@nl{The #1 amount is not a multiple of step.\MessageBreak
The effective maximum #1 is \the\@tempcnta\space
- (step \number\MT@step)}
+ (step \number\MT@step)}%
\fi
- }
- \MT@check@step{stretch}
- \MT@check@step{shrink}
- \MT@check@active@set{ex}
+ }%
+ \MT@check@step{stretch}%
+ \MT@check@step{shrink}%
+ \MT@check@active@set{ex}%
\CheckCommand*\showhyphens[1]{\setbox0\vbox{%
\color@begingroup\everypar{}\parfillskip\z@skip
\hsize\maxdimen\normalfont\pretolerance\m@ne\tolerance\m@ne
- \hbadness\z@\showboxdepth\z@\ #1\color@endgroup}}
+ \hbadness\z@\showboxdepth\z@\ #1\color@endgroup}}%
\gdef\showhyphens#1{\setbox0\vbox{%
\color@begingroup\pdfadjustspacing\z@\everypar{}\parfillskip\z@skip
\hsize\maxdimen\normalfont\pretolerance\m@ne\tolerance\m@ne
- \hbadness\z@\showboxdepth\z@\ #1\color@endgroup}}
+ \hbadness\z@\showboxdepth\z@\ #1\color@endgroup}}%
\else
\let\MT@expansion\relax
- \MT@info@nl{No font expansion}
+ \MT@info@nl{No font expansion}%
\fi
}
\MT@requires@pdftex6{
\def\MT@warn@lua#1{%
\MT@error{The `#1' feature doesn't currently work\MessageBreak with luatex}
{Use pdftex instead.}%
+ \csname MT@#1false\endcsname
\MT@let@nc{MT@#1}\relax
}
\MT@addto@setup{%
\ifMT@tracking
- \MT@requires@luatex{\MT@warn@lua{tracking}}{
- \edef\MT@active@features{\MT@active@features,tr}
- \MT@info@nl{Tracking enabled}
- \MT@check@active@set{tr}
+ \MT@requires@luatex{\MT@warn@lua{tracking}}{%
+ \edef\MT@active@features{\MT@active@features,tr}%
+ \MT@info@nl{Tracking enabled}%
+ \MT@check@active@set{tr}%
\ifMT@protrusion\else\pdfprotrudechars\@ne\fi
- }
+ }%
\else
\let\MT@tracking\relax
- \MT@info@nl{No tracking}
+ \MT@info@nl{No tracking}%
\fi
\ifMT@spacing
- \MT@requires@luatex{\MT@warn@lua{spacing}}{
- \edef\MT@active@features{\MT@active@features,sp}
+ \MT@requires@luatex{\MT@warn@lua{spacing}}{%
+ \edef\MT@active@features{\MT@active@features,sp}%
\pdfadjustinterwordglue\@ne
- \MT@info@nl{Adjustment of interword spacing enabled}
- \MT@check@active@set{sp}
- }
+ \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}
+ \MT@info@nl{No adjustment of interword spacing}%
\fi
\ifMT@kerning
- \MT@requires@luatex{\MT@warn@lua{kerning}}{
- \edef\MT@active@features{\MT@active@features,kn}
+ \MT@requires@luatex{\MT@warn@lua{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}
- }
+ \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}
+ \MT@info@nl{No adjustment of character kerning}%
\fi
\ifnum\pdfoutput<\@ne
\def\MT@warn@tracking@DVI{%
@@ -3564,38 +3574,38 @@ time will almost certainly lead to undesired results. Have your choice!}%
processing program (dvips, dvipdfm(x), ...) is\MessageBreak
able to create the virtual fonts on the fly}%
\MT@glet\MT@warn@tracking@DVI\relax
- }
+ }%
\else
\def\MT@warn@tracking@DVI{%
\ifnum\pdfprotrudechars<\@ne \global\pdfprotrudechars\@ne \fi
\MT@glet\MT@warn@tracking@DVI\relax
- }
+ }%
\fi
\ifnum\MT@letterspace=\m@ne
\let\MT@letterspace\MT@letterspace@default
\else
\MT@ls@too@large\MT@letterspace
\fi
- }
+ }%
}{
\MT@addto@setup{%
\ifMT@tracking
\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)}
+ \MT@info@nl{No tracking (pdftex too old)}%
\fi
\ifMT@spacing
\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)}
+ \MT@info@nl{No adjustment of interword spacing (pdftex too old)}%
\fi
\ifMT@kerning
\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)}
+ \MT@info@nl{No adjustment of character kerning (pdftex too old)}%
\fi
}
}
@@ -3608,7 +3618,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
}\relax
\MT@addto@setup{%
\ifx\MT@active@features\@empty \else
- \edef\MT@active@features{\expandafter\@gobble\MT@active@features}
+ \edef\MT@active@features{\expandafter\@gobble\MT@active@features}%
\fi
\MT@documenttrue
}
@@ -3634,17 +3644,17 @@ time will almost certainly lead to undesired results. Have your choice!}%
\MT@addto@setup{%
\ifMT@babel
\@ifpackageloaded{babel}{%
- \MT@info@nl{Redefining babel's language switching commands}
+ \MT@info@nl{Redefining babel's language switching commands}%
\let\MT@orig@select@language\select@language
\def\select@language#1{%
\MT@orig@select@language{#1}%
\MT@set@babel@context{#1}%
- }
+ }%
\let\MT@orig@foreign@language\foreign@language
\def\foreign@language#1{%
\MT@orig@foreign@language{#1}%
\MT@set@babel@context{#1}%
- }
+ }%
\ifMT@kerning
\MT@if@false
\MT@with@babel@and@T{french} \MT@if@true
@@ -3660,8 +3670,8 @@ time will almost certainly lead to undesired results. Have your choice!}%
\MT@set@babel@context\languagename
}{%
\MT@warning@nl{You did not load the babel package.\MessageBreak
- The `babel' option won't have any effect}
- }
+ The `babel' option won't have any effect}%
+ }%
\fi
}
\MT@addto@setup{\fi
diff --git a/Master/texmf-dist/tex/latex/microtype/mt-cmr.cfg b/Master/texmf-dist/tex/latex/microtype/mt-cmr.cfg
index 4bac2ddabeb..5ce65196d3a 100644
--- a/Master/texmf-dist/tex/latex/microtype/mt-cmr.cfg
+++ b/Master/texmf-dist/tex/latex/microtype/mt-cmr.cfg
@@ -37,7 +37,7 @@
%% ------------------------------------------------------------------------
%%
\ProvidesFile
- {mt-cmr.cfg}[2008/02/29 v1.9a microtype config. file: Computer Modern Roman (RS)]
+ {mt-cmr.cfg}[2009/11/09 v2.0 microtype config. file: Computer Modern Roman (RS)]
%%% -----------------------------------------------------------------------
%%% PROTRUSION
@@ -98,7 +98,7 @@
{ encoding = {OT1,OT4},
family = cmr }
{
- \AE = { 50, },
+ \AE = {50, },
"00 = { ,150}, % \Gamma
"01 = {100,100}, % \Delta
"02 = { 50, 50}, % \Theta
@@ -137,6 +137,30 @@
}
\SetProtrusion
+ [ name = cmr-T2A,
+ load = cmr-default ]
+ { encoding = T2A,
+ family = cmr }
+ {
+ \CYRA = {50,50},
+ \CYRG = { ,50},
+ \CYRK = { ,50},
+ \CYRT = {50,50},
+ \CYRH = {50,50},
+ \CYRU = {50,50},
+ \cyrk = { ,50},
+ \cyrg = { ,50},
+ \cyrh = {50,50},
+ \cyru = {50,70},
+ _ = {200,200},
+ \textbackslash = {200,300}, \quotedblbase = {400,400},
+ \textquotedbl = {300,300}, \textquotedblleft = {200,600},
+ \guillemotleft = {300,200}, \guillemotright = {100,400},
+ \textbraceleft = {400,200}, \textbraceright = {200,400},
+ \textless = {200,100}, \textgreater = {100,200}
+ }
+
+\SetProtrusion
[ name = cmr-T5,
load = cmr-default ]
{ encoding = T5,
@@ -254,6 +278,53 @@
}
\SetProtrusion
+ [ name = cmr-it-T2A,
+ load = cmr-it ]
+ { encoding = T2A,
+ family = cmr,
+ shape = it }
+ {
+ \CYRA = {100,50},
+ \CYRB = {50, },
+ \CYRV = {50, },
+ \CYRG = {100, },
+ \CYRD = {50, },
+ \CYRE = {50, },
+ \CYRZH = {50, },
+ \CYRZ = {50, },
+ \CYRI = {50, },
+ \CYRISHRT = {50, },
+ \CYRK = {50, },
+ \CYRL = {50, },
+ \CYRM = {50, },
+ \CYRN = {50, },
+ \CYRO = {100, },
+ \CYRP = {50, },
+ \CYRR = {50, },
+ \CYRS = {100, },
+ \CYRT = {100, },
+ \CYRU = {100, },
+ \CYRF = {100, },
+ \CYRH = {50, },
+ \CYRC = {50, },
+ \CYRCH = {100, },
+ \CYRSH = {50, },
+ \CYRSHCH = {50, },
+ \CYRHRDSN = {100, },
+ \CYRERY = {50, },
+ \CYRSFTSN = {50, },
+ \CYREREV = {50, },
+ \CYRYU = {50, },
+ \CYRYA = {50, },
+ _ = {100,200},
+ \textbackslash = {300,300}, \quotedblbase = {200,600},
+ \guillemotleft = {400,100}, \guillemotright = {200,300},
+ \textbraceleft = {400,100}, \textbraceright = {200,200},
+ \textquotedblleft = {500,300},
+ \textless = {300,100}, \textgreater = {200,100}
+ }
+
+\SetProtrusion
[ name = cmr-it-T5,
load = cmr-it ]
{ encoding = T5,
@@ -296,6 +367,19 @@
}
\SetProtrusion
+ [ name = cmr-sl-T2A,
+ load = cmr-it-T2A ]
+ { encoding = T2A,
+ family = cmr,
+ shape = sl }
+ {
+ L = { ,50},
+ f = { ,-50},
+ - = {300, },
+ \textendash = {400, }, \textemdash = {300, }
+ }
+
+\SetProtrusion
[ name = cmr-sl-T5,
load = cmr-it-T5 ]
{ encoding = T5,
@@ -373,6 +457,19 @@
}
\SetProtrusion
+ [ name = cmr-sc-T2A,
+ load = cmr-T2A ]
+ { encoding = T2A,
+ family = cmr,
+ shape = sc }
+ {
+ \cyra = {50,50},
+ \cyrg = { ,50},
+ \cyrt = {50,50},
+ \cyry = { ,50}
+ }
+
+\SetProtrusion
[ name = cmr-sc-T5,
load = cmr-T5 ]
{ encoding = T5,
diff --git a/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg b/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg
index 5f573ace26a..1dd68e1338f 100644
--- a/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg
+++ b/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg
@@ -109,6 +109,7 @@
{ encoding = QX,
family = {ptm,ptmx,ptmj} }
{
+ \AE = {50, },
* = {200,200},
{=} = {100,100},
\textunderscore = {100,100},