diff options
author | Karl Berry <karl@freefriends.org> | 2006-08-18 23:40:18 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2006-08-18 23:40:18 +0000 |
commit | 1d102fcc3e1ff7bef88c49faa696ee3c3ab1f001 (patch) | |
tree | 5e877dc4a2f0d1058174c21492d0516f94e70571 /Master/texmf-dist/tex | |
parent | 8911130fdff85f2fdfa5d970b06767d60f2b8368 (diff) |
microtype 1.9e (28jul06)
git-svn-id: svn://tug.org/texlive/trunk@1982 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
17 files changed, 568 insertions, 339 deletions
diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.cfg b/Master/texmf-dist/tex/latex/microtype/microtype.cfg index ae5e4b57548..1ecd0090bef 100644 --- a/Master/texmf-dist/tex/latex/microtype/microtype.cfg +++ b/Master/texmf-dist/tex/latex/microtype/microtype.cfg @@ -6,23 +6,23 @@ %% %% microtype.dtx (with options: `config,cfg-t,m-t') %% -%% ----------------------------------------------------------------------- -%% The `microtype' package +%% ------------------------------------------------------------------------ +%% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX %% Copyright (c) 2004--2006 R Schlicht <w.m.l@gmx.net> %% -%% This work may be distributed and/or modified under the conditions of -%% the LaTeX Project Public License, either version 1.3 of this license or -%% (at your option) any later version. The latest version of this license -%% is in: http://www.latex-project.org/lppl.txt, and version 1.3 or later -%% is part of all distributions of LaTeX version 2003/12/01 or later. +%% This work may be distributed and/or modified under the conditions of the +%% LaTeX Project Public License, either version 1.3c of this license or (at +%% your option) any later version. The latest version of this license is in: +%% http://www.latex-project.org/lppl.txt, and version 1.3c or later is part +%% of all distributions of LaTeX version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `author-maintained'. %% %% This work consists of the files microtype.dtx and microtype.ins and the %% derived file microtype.sty. %% -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% This is the main configuration file for the `microtype' package. %% It contains settings for font expansion and character protrusion, %% as well as character inheritance and font set declarations. @@ -33,12 +33,12 @@ %% me know. %% %% When modifying this file, also change the identification line below. -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% \ProvidesFile {microtype.cfg}[2006/04/20 v1.8 microtype main configuration file (RS)] -%%% ---------------------------------------------------------------------- +%%% ----------------------------------------------------------------------- %%% FONT SETS \DeclareMicrotypeSet{all} @@ -67,13 +67,13 @@ \DeclareMicrotypeSet{normalfont} { font = */*/*/*/* } -%%% ---------------------------------------------------------------------- +%%% ----------------------------------------------------------------------- %%% DEFAULT SETS \DeclareMicrotypeSetDefault[protrusion]{alltext} \DeclareMicrotypeSetDefault[expansion] {basictext} -%%% ---------------------------------------------------------------------- +%%% ----------------------------------------------------------------------- %%% FONT ALIASES \DeclareMicrotypeAlias{lmr} {cmr} % lmodern @@ -85,13 +85,15 @@ \DeclareMicrotypeAlias{qpl} {ppl} % qfonts/QuasiPalatino \DeclareMicrotypeAlias{txr} {ptm} % txfonts \DeclareMicrotypeAlias{qtm} {ptm} % qfonts/QuasiTimes +\DeclareMicrotypeAlias{zeur}{eur} % Euler VM +\DeclareMicrotypeAlias{zeus}{eus} \DeclareMicrotypeAlias{mdbch}{bch} % mathdesign/Charter \DeclareMicrotypeAlias{mdugm}{ugm} % mathdesign/URW Garamond -\DeclareMicrotypeAlias{zpeus}{zpeu} % Adobe Euro sans -> serif +\DeclareMicrotypeAlias{zpeus} {zpeu} % Adobe Euro sans -> serif \DeclareMicrotypeAlias{eurosans}{zpeu} % Adobe Euro sans -> serif \DeclareMicrotypeAlias{euroitcs}{euroitc} % ITC Euro sans -> serif -%%% ---------------------------------------------------------------------- +%%% ----------------------------------------------------------------------- %%% CHARACTER INHERITANCE \DeclareCharacterInheritance @@ -253,7 +255,7 @@ y = {\`y,\'y,\~y,\h y,\d y}, } -%%% ---------------------------------------------------------------------- +%%% ----------------------------------------------------------------------- %%% EXPANSION SETTINGS \SetExpansion @@ -318,7 +320,7 @@ 9 = 700, } -%%% ---------------------------------------------------------------------- +%%% ----------------------------------------------------------------------- %%% PROTRUSION SETTINGS \SetProtrusion diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.sty b/Master/texmf-dist/tex/latex/microtype/microtype.sty index 0780299e6e0..496d7dae339 100644 --- a/Master/texmf-dist/tex/latex/microtype/microtype.sty +++ b/Master/texmf-dist/tex/latex/microtype/microtype.sty @@ -6,27 +6,27 @@ %% %% microtype.dtx (with options: `package') %% -%% ----------------------------------------------------------------------- -%% The `microtype' package +%% ------------------------------------------------------------------------ +%% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX %% Copyright (c) 2004--2006 R Schlicht <w.m.l@gmx.net> %% -%% This work may be distributed and/or modified under the conditions of -%% the LaTeX Project Public License, either version 1.3 of this license or -%% (at your option) any later version. The latest version of this license -%% is in: http://www.latex-project.org/lppl.txt, and version 1.3 or later -%% is part of all distributions of LaTeX version 2003/12/01 or later. +%% This work may be distributed and/or modified under the conditions of the +%% LaTeX Project Public License, either version 1.3c of this license or (at +%% your option) any later version. The latest version of this license is in: +%% http://www.latex-project.org/lppl.txt, and version 1.3c or later is part +%% of all distributions of LaTeX version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `author-maintained'. %% %% This work consists of the files microtype.dtx and microtype.ins and the %% derived file microtype.sty. %% -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{microtype}[2006/05/05 - v1.9d +\ProvidesPackage{microtype}[2006/07/28 + v1.9e Micro-typography with pdfTeX (RS)] \newcommand*\DeclareMicrotypeSet[3][]{} \newcommand*\UseMicrotypeSet[2][]{} @@ -40,28 +40,28 @@ \newcommand*\microtypesetup[1]{} \newcommand*\microtypecontext[1]{} \def\DeclareMicrotypeSet#1#{\@gobbletwo} -\@onlypreamble{\DeclareMicrotypeSet} -\@onlypreamble{\UseMicrotypeSet} -\@onlypreamble{\DeclareMicrotypeSetDefault} -\@onlypreamble{\DisableLigatures} +\@onlypreamble\DeclareMicrotypeSet +\@onlypreamble\UseMicrotypeSet +\@onlypreamble\DeclareMicrotypeSetDefault +\@onlypreamble\DisableLigatures \def\MT@old@cmd#1#2{% \newcommand*#1{\MT@warning{% \string#1 is deprecated. Please use\MessageBreak \string#2 instead}% \let #1#2#2}} -\MT@old@cmd\DeclareMicroTypeSet\DeclareMicrotypeSet -\MT@old@cmd\UseMicroTypeSet\UseMicrotypeSet \MT@old@cmd\DeclareMicroTypeAlias\DeclareMicrotypeAlias -\MT@old@cmd\LoadMicroTypeFile\LoadMicrotypeFile +\MT@old@cmd\DeclareMicroTypeSet \DeclareMicrotypeSet +\MT@old@cmd\UseMicroTypeSet \UseMicrotypeSet +\MT@old@cmd\LoadMicroTypeFile \LoadMicrotypeFile \def\MT@MT{microtype} -\def\MT@error{\PackageError{\MT@MT}} -\def\MT@warning{\PackageWarning{\MT@MT}} +\def\MT@error{\PackageError\MT@MT} +\def\MT@warning{\PackageWarning\MT@MT} \def\MT@warning@nl#1{\MT@warning{#1\@gobble}} \def\MT@warn@err#1{\MT@error{#1}{% This error message appears because you loaded the `\MT@MT'\MessageBreak package with the option `verbose=errors'. Consult the documentation\MessageBreak in \MT@MT.(pdf,dvi) to find out what went wrong.}} -\def\MT@info{\PackageInfo{\MT@MT}} +\def\MT@info{\PackageInfo\MT@MT} \def\MT@info@nl#1{\MT@info{#1\@gobble}} \let\MT@vinfo\@gobble \let\MT@pdftex@no\z@ @@ -135,7 +135,6 @@ \newif\ifMT@selected \newif\ifMT@noligatures \newif\ifMT@draft -\newif\ifMT@document \let\MT@pr@level\tw@ \let\MT@pr@factor\@m \let\MT@pr@unit\@empty @@ -152,6 +151,7 @@ \def\MT@stretch@default{20 } \def\MT@shrink@default{20 } \def\MT@step@default{4 } +\newif\ifMT@document \expandafter\let\expandafter\MT@requires@etex \ifcase 0% \ifx\eTeXversion\@undefined 1\else @@ -183,64 +183,32 @@ #1\expandafter\expandafter\expandafter {\expandafter#2\expandafter}\expandafter{#3}} \MT@requires@etex{ - \def\MT@ifdefined@c@T#1{% - \ifdefined#1% - \expandafter\@firstofone - \else - \expandafter\@gobble - \fi + \def\MT@ifdefined@c@T#1{\ifdefined#1% + \expandafter\@firstofone\else\expandafter\@gobble\fi } - \def\MT@ifdefined@c@TF#1{% - \ifdefined#1% - \expandafter\@firstoftwo - \else - \expandafter\@secondoftwo - \fi + \def\MT@ifdefined@c@TF#1{\ifdefined#1% + \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi } - \def\MT@ifdefined@n@T#1{% - \ifcsname#1\endcsname - \expandafter\@firstofone - \else - \expandafter\@gobble - \fi + \def\MT@ifdefined@n@T#1{\ifcsname#1\endcsname + \expandafter\@firstofone\else\expandafter\@gobble\fi } - \def\MT@ifdefined@n@TF#1{% - \ifcsname#1\endcsname - \expandafter\@firstoftwo - \else - \expandafter\@secondoftwo - \fi + \def\MT@ifdefined@n@TF#1{\ifcsname#1\endcsname + \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi } }{ - \def\MT@ifdefined@c@T#1{% - \ifx#1\@undefined - \expandafter\@gobble - \else - \expandafter\@firstofone - \fi + \def\MT@ifdefined@c@T#1{\ifx#1\@undefined + \expandafter\@gobble\else\expandafter\@firstofone\fi } - \def\MT@ifdefined@c@TF#1{% - \ifx#1\@undefined - \expandafter\@secondoftwo - \else - \expandafter\@firstoftwo - \fi + \def\MT@ifdefined@c@TF#1{\ifx#1\@undefined + \expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi } - \def\MT@ifdefined@n@T#1{% - \begingroup\MT@exp@two@c\endgroup + \def\MT@ifdefined@n@T#1{\begingroup\MT@exp@two@c\endgroup \ifx\csname #1\endcsname\relax - \expandafter\@gobble - \else - \expandafter\@firstofone - \fi + \expandafter\@gobble\else\expandafter\@firstofone\fi } - \def\MT@ifdefined@n@TF#1{% - \begingroup\MT@exp@two@c\endgroup + \def\MT@ifdefined@n@TF#1{\begingroup\MT@exp@two@c\endgroup \ifx\csname #1\endcsname\relax - \expandafter\@secondoftwo - \else - \expandafter\@firstoftwo - \fi + \expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi } } \MT@requires@etex{ @@ -282,7 +250,7 @@ \MT@requires@pdftex6{ \def\MT@ifdimen#1{% \ifcase\pdfmatch{^([0-9]+([.,][0-9]+)?|[.,][0-9]+)% - (em|ex|cm|mm|in|pc|pt|dd|cc|bp|sp|nd|nc)? *$}{#1}\relax + (em|ex|cm|mm|in|pc|pt|dd|cc|bp|sp|nd|nc|px)? *$}{#1}\relax \expandafter\@secondoftwo \else \expandafter\@firstoftwo @@ -378,15 +346,9 @@ \expandafter\x\expandafter,#2,#1,\@empty\@nnil } \def\MT@rem@from@clist#1#2{% - \def\x##1,#1,##2##3\@nnil{% - \ifx##2\@empty\else - \ifx\\##1\\\global\let#2\@gobble - \else\xdef#2{\@gobble##1}\fi - \def\x####1,#1,####2####3\@nnil{\xdef#2{#2####1}}% - \x,##2##3,#1,\@nnil - \fi - }% - \expandafter\x\expandafter,#2,#1,\@empty\@nnil + \def\x##1,#1,##2\x{##1,##2\y}% + \def\y##1,\y##2\y{\ifx,##1\@empty\else##1\fi}% + \xdef#2{\MT@exp@two@c\y\x\expandafter,#2,\y,#1,\x}% } \def\MT@in@tlist#1#2{% \MT@inlist@false @@ -410,7 +372,7 @@ \MT@ifdim{#1}=\MT@size \MT@inlist@true \relax - }{% + }{% \MT@ifdim\MT@size<{#1}\relax{% \MT@ifdim\MT@size<{#2}% \MT@inlist@true @@ -485,13 +447,8 @@ \fi } \let\MT@setup@\@empty -\def\MT@addto@setup#1{% - \begingroup - \MT@toks\expandafter{\MT@setup@#1}% - \xdef\MT@setup@{\the\MT@toks}% - \endgroup -} -\AtBeginDocument{\MT@setup@} +\def\MT@addto@setup{\g@addto@macro\MT@setup@} +\AtBeginDocument{\MT@setup@ \global\let\MT@setup@\@empty} \def\MT@with@package#1{\@ifpackageloaded{#1}\@firstofone\@gobble} \def\MT@pdfcprot@error{% \MT@error{Detected the `pdfcprot' package!\MessageBreak @@ -502,9 +459,9 @@ time will almost certainly lead to undesired results. Have your choice!}% \let\MT@pdfcprot@error\relax } \MT@with@package{pdfcprot}\MT@pdfcprot@error -\def\MT@ledmac@setup{% - \ifMT@protrusion - \MT@requires@pdftex5{% +\MT@requires@pdftex5{ + \def\MT@ledmac@setup{% + \ifMT@protrusion \MT@ifdefined@c@TF\l@dunhbox@line{% \MT@info@nl{Patching ledmac to enable character protrusion}% \newdimen\MT@led@kern @@ -522,14 +479,18 @@ time will almost certainly lead to undesired results. Have your choice!}% Character protrusion in paragraphs with line\MessageBreak numbering will only work if you update ledmac}% }% - }{% + \fi + } +}{ + \def\MT@ledmac@setup{% + \ifMT@protrusion \MT@warning@nl{% The pdftex version you are using does not allow\MessageBreak character protrusion in paragraphs with line\MessageBreak numbering by the `ledmac' package.\MessageBreak Upgrade pdftex to version 1.30 or later}% - }% - \fi + \fi + } } \def\MT@restore@p@h{\chardef\%`\% \chardef\#`\# } \def\MT@setupfont@hook{% @@ -842,6 +803,7 @@ time will almost certainly lead to undesired results. Have your choice!}% \@tempcntb=#1\relax } \def\MT@get@opt{% + \MT@set@listname \MT@ifdefined@n@TF{MT@\MT@feat @c@\csname MT@\MT@feat @c@name\endcsname @factor}{% \MT@let@nn{MT@\MT@feat @factor@} {MT@\MT@feat @c@\csname MT@\MT@feat @c@name\endcsname @factor}% @@ -876,8 +838,9 @@ 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}{% - \MT@set@listname \csname MT@preset@\MT@feat\endcsname \MT@let@nc{MT@reset@\MT@feat @codes}\relax }% @@ -910,6 +873,19 @@ 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}{% + \MT@ifdefined@c@TF\inputencoding{% + \inputencoding{\@nameuse{% + MT@\MT@feat @\MT@cat @\csname MT@\MT@feat @\MT@cat @name\endcsname @inputenc}}% + }{% + \MT@error{Key `inputenc' used in \MT@curr@list@name, but the `inputenc' + \MessageBreak package isn't loaded}% + {You must load the `inputenc' package before you can use the `inputenc' key.}% + }% + }% +} \def\MT@set@pr@heirs#1{% \lpcode\MT@font#1=\lpcode\MT@font\MT@char \rpcode\MT@font#1=\rpcode\MT@font\MT@char @@ -1029,6 +1005,7 @@ time will almost certainly lead to undesired results. Have your choice!}% \@tempcntb=#1\relax } \def\MT@get@ex@opt{% + \MT@set@listname \MT@ifdefined@n@TF{MT@ex@c@\MT@ex@c@name @factor}{% \MT@let@cn\MT@ex@factor@{MT@ex@c@\MT@ex@c@name @factor}% \MT@vinfo{... : Multiplying expansion factors by \number\MT@ex@factor@/1000}% @@ -1040,8 +1017,9 @@ 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@set@listname \MT@preset@ex \let\MT@reset@ef@codes\relax }% @@ -1193,7 +1171,7 @@ time will almost certainly lead to undesired results. Have your choice!}% /\ifnum#2=\@ne \MT@series\fi /\ifnum#3=\@ne \MT@shape\fi /\ifnum#4=\@ne *\fi - \MT@context}% + \MT@context}% \MT@ifdefined@n@T{MT@\@tempb @\@tempa}{% \MT@next@listname@#4% }% @@ -1233,7 +1211,7 @@ time will almost certainly lead to undesired results. Have your choice!}% for font\MessageBreak`\MT@exp@string\MT@font'% \ifx\MT@context\@empty\else\space(context: `\MT@context')\fi. Switching off\MessageBreak\@nameuse{MT@abbr@\MT@feat} for this font}% - \fi + \fi \@secondoftwo }% } @@ -1246,8 +1224,12 @@ time will almost certainly lead to undesired results. Have your choice!}% \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 \expandafter\MT@inh@do\@tempc,\relax,% \global\MT@let@nc{MT@\MT@feat @inh@\csname MT@\MT@feat @inh@name\endcsname}\@empty + \endgroup \fi }{% \MT@let@nc{MT@\MT@feat @inh@name}\@undefined @@ -1396,13 +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'. Make sure it's a single\MessageBreak - character (or a number) in \MT@curr@list@name}% + in font encoding `\MT@encoding'\MT@warn@maybe@inputenc + 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' in \MT@curr@list@name}% + in font encoding `\MT@encoding'\MT@warn@maybe@inputenc + 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}% } \let\MT@font@list\@empty \let\MT@font\@empty @@ -1418,8 +1410,9 @@ time will almost certainly lead to undesired results. Have your choice!}% applied to the document.\MessageBreak (Hint: Turn on `verbose' mode)% } \fi + \g@addto@macro\pickup@font{\begingroup} + \MT@with@package{trace}{\g@addto@macro\pickup@font{\conditionally@traceoff}} \g@addto@macro\pickup@font{% - \begingroup \escapechar\m@ne \ifx\MT@font\@empty \let\MT@font\font@name @@ -1433,8 +1426,8 @@ time will almost certainly lead to undesired results. Have your choice!}% \MT@setupfont \MT@register@font \fi + \global\let\MT@font\@empty \endgroup - \global\let\MT@font\@empty } \let\MT@pickupfont\pickup@font \let\MT@orig@add@accent\add@accent @@ -1607,9 +1600,7 @@ time will almost certainly lead to undesired results. Have your choice!}% } \def\MT@test@ast#1*#2\@nil{% \def\@tempa{#1}% - \MT@ifempty{#2}% - \@gobble - \@firstofone + \MT@ifempty{#2}\@gobble\@firstofone } \def\MT@fix@font@spec#1{% \xdef#1{#1}% @@ -1644,11 +1635,9 @@ time will almost certainly lead to undesired results. Have your choice!}% \ifx\MT@val\relax \else \edef\MT@lower{\MT@val}% \MT@ifempty{#2}{% - \MT@ifempty{#3}{% - \def\MT@upper{-1}% - }{% - \def\MT@upper{2048}% - }% + \MT@ifempty{#3}% + {\def\MT@upper{-1}}% + {\def\MT@upper{2048}}% }{% \def\MT@val{#2}% \MT@get@size @@ -1662,9 +1651,9 @@ time will almost certainly lead to undesired results. Have your choice!}% }{% \edef\MT@upper{\MT@val}% }% - \MT@ifdim\MT@lower=\MT@upper{% - \def\MT@upper{-1}% - }\relax + \MT@ifdim\MT@lower=\MT@upper + {\def\MT@upper{-1}}% + \relax \fi }% \fi @@ -1773,6 +1762,21 @@ time will almost certainly lead to undesired results. Have your choice!}% Using set `\@nameuse{MT@#1@setname}' instead}% }% } +\MT@requires@pdftex5{ + \renewcommand*\DisableLigatures[1]{% + \edef\MT@active@features{\MT@active@features,nl}% + \MT@noligaturestrue + \MT@declare@sets{nl}{no ligatures}{#1}% + \gdef\MT@nl@setname{no ligatures}% + } +}{ + \renewcommand*\DisableLigatures[1]{% + \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 + } +} \renewcommand*\DeclareMicrotypeSetDefault[2][]{% \KV@@sp@def\@tempa{#1}% \MT@ifempty\@tempa{% @@ -1832,28 +1836,13 @@ time will almost certainly lead to undesired results. Have your choice!}% \MT@end@catcodes \fi } -\MT@requires@pdftex5{ - \renewcommand*\DisableLigatures[1]{% - \edef\MT@active@features{\MT@active@features,nl}% - \MT@noligaturestrue - \MT@declare@sets{nl}{no ligatures}{#1}% - \gdef\MT@nl@setname{no ligatures}% - } -}{ - \renewcommand*\DisableLigatures[1]{% - \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 - } -} \renewcommand*\SetProtrusion[2][]{% \let\MT@pr@c@name\@undefined \let\MT@extra@context\@empty - \MT@map@clist@n{load,factor,unit,preset}{\MT@let@nc{MT@extra@##1}\@undefined}% + \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}{\MT@set@opt{pr}{##1}}% + \MT@map@clist@n{factor,unit,preset,inputenc}{\MT@set@opt{pr}{##1}}% \def\MT@permutelist{pr@c}% \setkeys{MT@cfg}{#2}% \MT@permute @@ -1867,11 +1856,11 @@ time will almost certainly lead to undesired results. Have your choice!}% \renewcommand*\SetExpansion[2][]{% \let\MT@ex@c@name\@undefined \let\MT@extra@context\@empty - \MT@map@clist@n{load,factor,preset,stretch,shrink,step,auto}% + \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,stretch,shrink,step,auto}{\MT@set@opt{ex}{##1}}% + \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 @@ -1980,6 +1969,8 @@ time will almost certainly lead to undesired results. Have your choice!}% \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}} \define@key{MT@pr@c}{unit}[character]{% @@ -2033,30 +2024,35 @@ time will almost certainly lead to undesired results. Have your choice!}% } \renewcommand*\DeclareCharacterInheritance[1][]{% \let\MT@extra@context\@empty - \KV@@sp@def\@tempa{#1}% + \let\MT@extra@inputenc\@undefined + \let\MT@inh@feat\@empty + \setkeys{MT@inh@}{#1}% \MT@begin@catcodes \MT@set@inh@list } \def\MT@set@inh@list#1#2{% - \MT@ifempty\@tempa{% + \MT@ifempty\MT@inh@feat{% \MT@map@clist@c\MT@features{{\MT@declare@char@inh{##1}{#1}{#2}}}% }{% - \MT@map@clist@c\@tempa{{% + \MT@map@clist@c\MT@inh@feat{{% \KV@@sp@def\@tempa{##1}% \MT@ifempty\@tempa\relax{% - \MT@is@feature{inheritance declaration for `#1'}{% - \MT@exp@one@n\MT@declare@char@inh - {\csname MT@rbba@\@tempa\endcsname}{#1}{#2}% - }% + \MT@exp@one@n\MT@declare@char@inh + {\csname MT@rbba@\@tempa\endcsname}{#1}{#2}% }% }}% }% \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}}} \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}% \def\MT@permutelist{#1@inh}% \setkeys{MT@inh}{#2}% @@ -2295,7 +2291,7 @@ time will almost certainly lead to undesired results. Have your choice!}% } \MT@define@option{protrusion} \MT@define@option{expansion} -\define@key{MT}{activate}[]{% +\define@key{MT}{activate}[true]{% \setkeys{MT}{protrusion={#1}}% \setkeys{MT}{expansion={#1}}% } @@ -2439,10 +2435,9 @@ time will almost certainly lead to undesired results. Have your choice!}% \MT@ifdefined@n@TF{MT@default@#1@set}\relax {\global\MT@def@n{MT@default@#1@set}{all}}% } -\MT@ifdefined@c@T\MicroType@Hook{% - \MT@warning{% - Command \string\MicroType@Hook\space is deprecated.\MessageBreak - Use \string\Microtype@Hook\space instead}\MicroType@Hook} +\MT@ifdefined@c@T\MicroType@Hook{\MT@warning{% + Command \string\MicroType@Hook\space is deprecated.\MessageBreak + Use \string\Microtype@Hook\space instead}\MicroType@Hook} \MT@ifdefined@c@T\Microtype@Hook\Microtype@Hook \def\microtypesetup{\setkeys{MT}} \MT@addto@setup{\def\microtypesetup{\setkeys{MTX}}} @@ -2506,15 +2501,14 @@ time will almost certainly lead to undesired results. Have your choice!}% } \MT@define@optionX{protrusion}\pdfprotrudechars \MT@define@optionX{expansion}\pdfadjustspacing -\define@key{MTX}{activate}[]{% +\define@key{MTX}{activate}[true]{% \setkeys{MTX}{protrusion={#1}}% \setkeys{MTX}{expansion={#1}}% } -\def\MT@gobblethree#1#2#3{} \let\MT@saved@setupfont\MT@setupfont \define@key{MTX}{disable}[]{% \MT@info{Inactivate `\MT@MT' package}% - \let\MT@setupfont\MT@gobblethree + \let\MT@setupfont\@gobble } \define@key{MTX}{enable}[]{% \MT@info{Reactivate `\MT@MT' package}% diff --git a/Master/texmf-dist/tex/latex/microtype/mt-bch.cfg b/Master/texmf-dist/tex/latex/microtype/mt-bch.cfg index 8695686c58a..bfa9e97a582 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-bch.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-bch.cfg @@ -6,37 +6,37 @@ %% %% microtype.dtx (with options: `config,cfg-t,bch') %% -%% ----------------------------------------------------------------------- -%% The `microtype' package +%% ------------------------------------------------------------------------ +%% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX %% Copyright (c) 2004--2006 R Schlicht <w.m.l@gmx.net> %% -%% This work may be distributed and/or modified under the conditions of -%% the LaTeX Project Public License, either version 1.3 of this license or -%% (at your option) any later version. The latest version of this license -%% is in: http://www.latex-project.org/lppl.txt, and version 1.3 or later -%% is part of all distributions of LaTeX version 2003/12/01 or later. +%% This work may be distributed and/or modified under the conditions of the +%% LaTeX Project Public License, either version 1.3c of this license or (at +%% your option) any later version. The latest version of this license is in: +%% http://www.latex-project.org/lppl.txt, and version 1.3c or later is part +%% of all distributions of LaTeX version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `author-maintained'. %% %% This work consists of the files microtype.dtx and microtype.ins and the %% derived file microtype.sty. %% -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' -%% package. It contains settings for font expansion and character +%% package. It may contain settings for font expansion and character %% protrusion. Please consult the documentation for details. %% %% If you think you have found improvements to these settings, please %% let me know. %% %% When modifying this file, also change the identification line below. -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% \ProvidesFile {mt-bch.cfg}[2005/12/02 v1.4 microtype config. file: Bitstream Charter (RS)] -%%% ---------------------------------------------------------------------- +%%% ----------------------------------------------------------------------- %%% PROTRUSION SETTINGS \SetProtrusion diff --git a/Master/texmf-dist/tex/latex/microtype/mt-cmr.cfg b/Master/texmf-dist/tex/latex/microtype/mt-cmr.cfg index 5f5a9a9c8e5..1e5279f839c 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-cmr.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-cmr.cfg @@ -6,37 +6,37 @@ %% %% microtype.dtx (with options: `config,cfg-t,cmr') %% -%% ----------------------------------------------------------------------- -%% The `microtype' package +%% ------------------------------------------------------------------------ +%% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX %% Copyright (c) 2004--2006 R Schlicht <w.m.l@gmx.net> %% -%% This work may be distributed and/or modified under the conditions of -%% the LaTeX Project Public License, either version 1.3 of this license or -%% (at your option) any later version. The latest version of this license -%% is in: http://www.latex-project.org/lppl.txt, and version 1.3 or later -%% is part of all distributions of LaTeX version 2003/12/01 or later. +%% This work may be distributed and/or modified under the conditions of the +%% LaTeX Project Public License, either version 1.3c of this license or (at +%% your option) any later version. The latest version of this license is in: +%% http://www.latex-project.org/lppl.txt, and version 1.3c or later is part +%% of all distributions of LaTeX version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `author-maintained'. %% %% This work consists of the files microtype.dtx and microtype.ins and the %% derived file microtype.sty. %% -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' -%% package. It contains settings for font expansion and character +%% package. It may contain settings for font expansion and character %% protrusion. Please consult the documentation for details. %% %% If you think you have found improvements to these settings, please %% let me know. %% %% When modifying this file, also change the identification line below. -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% \ProvidesFile - {mt-cmr.cfg}[2005/11/07 v1.9 microtype config. file: Computer Modern (RS)] + {mt-cmr.cfg}[2005/11/07 v1.9 microtype config. file: Computer Modern Roman (RS)] -%%% ---------------------------------------------------------------------- +%%% ----------------------------------------------------------------------- %%% PROTRUSION SETTINGS \SetProtrusion @@ -547,7 +547,6 @@ "2D = {200,300}, % \rhook "2E = { ,100}, % \triangleright "2F = {100, }, % \triangleleft - % 0 - 9 "3A = { ,500}, % ., \ldotp "3B = { ,500}, % , "3C = {200,100}, % < diff --git a/Master/texmf-dist/tex/latex/microtype/mt-euf.cfg b/Master/texmf-dist/tex/latex/microtype/mt-euf.cfg index 2b868f9b4e7..6f2e5c972e0 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-euf.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-euf.cfg @@ -6,37 +6,37 @@ %% %% microtype.dtx (with options: `config,cfg-u,euf') %% -%% ----------------------------------------------------------------------- -%% The `microtype' package +%% ------------------------------------------------------------------------ +%% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX %% Copyright (c) 2004--2006 R Schlicht <w.m.l@gmx.net> %% -%% This work may be distributed and/or modified under the conditions of -%% the LaTeX Project Public License, either version 1.3 of this license or -%% (at your option) any later version. The latest version of this license -%% is in: http://www.latex-project.org/lppl.txt, and version 1.3 or later -%% is part of all distributions of LaTeX version 2003/12/01 or later. +%% This work may be distributed and/or modified under the conditions of the +%% LaTeX Project Public License, either version 1.3c of this license or (at +%% your option) any later version. The latest version of this license is in: +%% http://www.latex-project.org/lppl.txt, and version 1.3c or later is part +%% of all distributions of LaTeX version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `author-maintained'. %% %% This work consists of the files microtype.dtx and microtype.ins and the %% derived file microtype.sty. %% -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' -%% package. It contains settings for font expansion and character +%% package. It may contain settings for font expansion and character %% protrusion. Please consult the documentation for details. %% %% If you think you have found improvements to these settings, please %% let me know. %% %% When modifying this file, also change the identification line below. -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% \ProvidesFile - {mt-euf.cfg}[2005/06/01 v1.0 microtype config. file: AMS Euler Fraktur (RS)] + {mt-euf.cfg}[2006/07/03 v1.1 microtype config. file: AMS Euler Fraktur (RS)] -%%% ---------------------------------------------------------------------- +%%% ----------------------------------------------------------------------- %%% PROTRUSION SETTINGS \SetProtrusion @@ -68,6 +68,21 @@ 3 = { 80, 50}, 4 = { 80, 50}, 7 = { 50, 50}, + "12 = {500,500}, + "13 = {500,500}, + ! = { ,200}, + ' = {200,300}, + ( = {200, }, + ) = { ,200}, + * = {200,200}, + + = {200,250}, + - = {200,200}, + {,} = {300,300}, + . = {400,400}, + {=} = {200,200}, + : = { ,200}, + ; = { ,200}, + ] = { ,200}, } \endinput diff --git a/Master/texmf-dist/tex/latex/microtype/mt-eur.cfg b/Master/texmf-dist/tex/latex/microtype/mt-eur.cfg new file mode 100644 index 00000000000..b749cf5eb84 --- /dev/null +++ b/Master/texmf-dist/tex/latex/microtype/mt-eur.cfg @@ -0,0 +1,120 @@ +%% +%% This is file `mt-eur.cfg', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% microtype.dtx (with options: `config,cfg-u,eur') +%% +%% ------------------------------------------------------------------------ +%% The `microtype' package +%% An interface to the micro-typographic extensions of pdfTeX +%% Copyright (c) 2004--2006 R Schlicht <w.m.l@gmx.net> +%% +%% This work may be distributed and/or modified under the conditions of the +%% LaTeX Project Public License, either version 1.3c of this license or (at +%% your option) any later version. The latest version of this license is in: +%% http://www.latex-project.org/lppl.txt, and version 1.3c or later is part +%% of all distributions of LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `author-maintained'. +%% +%% This work consists of the files microtype.dtx and microtype.ins and the +%% derived file microtype.sty. +%% +%% ------------------------------------------------------------------------ +%% This is a font-specific configuration file for the `microtype' +%% package. It may contain settings for font expansion and character +%% protrusion. Please consult the documentation for details. +%% +%% If you think you have found improvements to these settings, please +%% let me know. +%% +%% When modifying this file, also change the identification line below. +%% ------------------------------------------------------------------------ +%% +\ProvidesFile + {mt-eur.cfg}[2006/07/28 v1.0 microtype config. file: AMS Euler Roman (RS)] + +%%% ----------------------------------------------------------------------- +%%% PROTRUSION SETTINGS + +\SetProtrusion + [ name = euler ] + { encoding = U, + family = eur } + { + "01 = {100,100}, + "03 = {100,150}, + "06 = { ,100}, + "07 = {100,150}, + "08 = {100,100}, + "0A = {100,100}, + "0B = { , 50}, + "0C = { ,100}, + "0D = {100,100}, + "0E = { ,100}, + "0F = {100,100}, + "10 = {100,100}, + "13 = { ,100}, + "14 = { ,100}, + "15 = { , 50}, + "16 = { , 50}, + "17 = { 50,100}, + "18 = { 50,100}, + "1A = { , 50}, + "1B = { , 50}, + "1C = { 50,100}, + "1D = { 50,100}, + "1E = { 50,100}, + "1F = { 50,100}, + "20 = { , 50}, + "21 = { , 50}, + "22 = { 50,100}, + "24 = { , 50}, + "27 = { 50,100}, + 1 = {100,100}, + 7 = { 50,100}, + "3A = {300,500}, + "3B = {200,400}, + "3C = {200,100}, + "3D = {200,200}, + "3E = {100,200}, + A = { ,100}, + D = { , 50}, + J = { 50, }, + K = { , 50}, + L = { , 50}, + Q = { , 50}, + T = { 50, }, + X = { 50, 50}, + Y = { 50, }, + h = { , 50}, + k = { , 50}, + } + +\SetProtrusion + [ name = euler-vm ] + { encoding = U, + family = zeur } + { + "28 = {100,200}, + "29 = {100,200}, + "2A = {100,150}, + "2B = {100,150}, + "2C = {200,300}, + "2D = {200,300}, + "2E = { ,100}, + "2F = {100, }, + "3F = {150,150}, + "5B = { ,100}, + "5E = {100,100}, + "5F = {100,100}, + "80 = { , 50}, + "81 = {200,250}, + "82 = {100,200}, + } + +\endinput +%% +%% End of file `mt-eur.cfg'. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-euroitc.cfg b/Master/texmf-dist/tex/latex/microtype/mt-euroitc.cfg index 3da4c547a44..84f596aee23 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-euroitc.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-euroitc.cfg @@ -6,37 +6,37 @@ %% %% microtype.dtx (with options: `config,cfg-e,euroitc') %% -%% ----------------------------------------------------------------------- -%% The `microtype' package +%% ------------------------------------------------------------------------ +%% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX %% Copyright (c) 2004--2006 R Schlicht <w.m.l@gmx.net> %% -%% This work may be distributed and/or modified under the conditions of -%% the LaTeX Project Public License, either version 1.3 of this license or -%% (at your option) any later version. The latest version of this license -%% is in: http://www.latex-project.org/lppl.txt, and version 1.3 or later -%% is part of all distributions of LaTeX version 2003/12/01 or later. +%% This work may be distributed and/or modified under the conditions of the +%% LaTeX Project Public License, either version 1.3c of this license or (at +%% your option) any later version. The latest version of this license is in: +%% http://www.latex-project.org/lppl.txt, and version 1.3c or later is part +%% of all distributions of LaTeX version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `author-maintained'. %% %% This work consists of the files microtype.dtx and microtype.ins and the %% derived file microtype.sty. %% -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' -%% package. It contains settings for font expansion and character +%% package. It may contain settings for font expansion and character %% protrusion. Please consult the documentation for details. %% %% If you think you have found improvements to these settings, please %% let me know. %% %% When modifying this file, also change the identification line below. -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% \ProvidesFile {mt-euroitc.cfg}[2006/05/04 v1.0 microtype config. file: ITC Euro (RS)] -%%% ---------------------------------------------------------------------- +%%% ----------------------------------------------------------------------- %%% PROTRUSION SETTINGS \SetProtrusion diff --git a/Master/texmf-dist/tex/latex/microtype/mt-eus.cfg b/Master/texmf-dist/tex/latex/microtype/mt-eus.cfg index ffd4fefe6cf..6badc694ebb 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-eus.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-eus.cfg @@ -6,37 +6,37 @@ %% %% microtype.dtx (with options: `config,cfg-u,eus') %% -%% ----------------------------------------------------------------------- -%% The `microtype' package +%% ------------------------------------------------------------------------ +%% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX %% Copyright (c) 2004--2006 R Schlicht <w.m.l@gmx.net> %% -%% This work may be distributed and/or modified under the conditions of -%% the LaTeX Project Public License, either version 1.3 of this license or -%% (at your option) any later version. The latest version of this license -%% is in: http://www.latex-project.org/lppl.txt, and version 1.3 or later -%% is part of all distributions of LaTeX version 2003/12/01 or later. +%% This work may be distributed and/or modified under the conditions of the +%% LaTeX Project Public License, either version 1.3c of this license or (at +%% your option) any later version. The latest version of this license is in: +%% http://www.latex-project.org/lppl.txt, and version 1.3c or later is part +%% of all distributions of LaTeX version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `author-maintained'. %% %% This work consists of the files microtype.dtx and microtype.ins and the %% derived file microtype.sty. %% -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' -%% package. It contains settings for font expansion and character +%% package. It may contain settings for font expansion and character %% protrusion. Please consult the documentation for details. %% %% If you think you have found improvements to these settings, please %% let me know. %% %% When modifying this file, also change the identification line below. -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% \ProvidesFile - {mt-eus.cfg}[2006/02/04 v1.1 microtype config. file: AMS Euler script (RS)] + {mt-eus.cfg}[2006/07/28 v1.2 microtype config. file: AMS Euler Script (RS)] -%%% ---------------------------------------------------------------------- +%%% ----------------------------------------------------------------------- %%% PROTRUSION SETTINGS \SetProtrusion @@ -65,6 +65,104 @@ X = { 50, 50}, Y = { 50, }, Z = { 50,100}, + "00 = {250,250}, + "18 = {200,200}, + "3A = {200,150}, + "40 = { ,100}, + "5E = {100,100}, + "5F = {100,100}, + "66 = { 50, }, + "67 = { , 50}, + "6E = {200,200}, + } + +\SetProtrusion + [ name = euscript-vm, + load = euscript ] + { encoding = U, + family = zeus } + { + "01 = {600,600}, + "02 = {200,200}, + "03 = {200,200}, + "04 = {200,200}, + "05 = {150,150}, + "06 = {200,200}, + "07 = {200,200}, + "08 = {100,100}, + "09 = {100,100}, + "0A = {100,100}, + "0B = {100,100}, + "0C = {100,100}, + "0D = {100,100}, + "0E = {150,150}, + "0F = {100,100}, + "10 = {150,150}, + "11 = {100,100}, + "12 = {150,100}, + "13 = {100,150}, + "14 = {150,100}, + "15 = {100,150}, + "16 = {200,100}, + "17 = {100,200}, + "19 = {150,150}, + "1A = {150,100}, + "1B = {100,150}, + "1C = {100,100}, + "1D = {100,100}, + "1E = {250,100}, + "1F = {100,250}, + "20 = {150,200}, + "21 = {150,200}, + "22 = {150,150}, + "23 = {150,150}, + "24 = {100,200}, + "25 = {150,150}, + "26 = {150,150}, + "27 = {100,100}, + "28 = {100,100}, + "29 = {100,150}, + "2A = {100,100}, + "2B = {100,100}, + "2C = {100,100}, + "2D = {150,150}, + "2E = {150,150}, + "2F = {100,100}, + "30 = {100,100}, + "31 = {100,100}, + "32 = {100,100}, + "33 = {100,100}, + "34 = {100,100}, + "35 = {100,100}, + "3E = {150,150}, + "3F = {150,150}, + "60 = { ,200}, + "61 = {200, }, + "62 = {100,100}, + "63 = {100,100}, + "64 = {100,100}, + "65 = {100,100}, + "68 = {300, }, + "69 = { ,300}, + "6C = {100,100}, + "6D = {100,100}, + "6F = {100,100}, + "72 = {100,100}, + "73 = {200,100}, + "76 = { ,100}, + "77 = {100, }, + "78 = { 50, 50}, + "79 = {100,100}, + "7A = {100,100}, + "7D = {150,150}, + "7E = {100,100}, + "A8 = {100,100}, + "A9 = {100,100}, + "AB = {200,200}, + "BA = { ,200}, + "BB = { ,200}, + "BD = {200,200}, + "DE = {200,200}, } \endinput diff --git a/Master/texmf-dist/tex/latex/microtype/mt-msa.cfg b/Master/texmf-dist/tex/latex/microtype/mt-msa.cfg index 31ccb357031..309abf253cb 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-msa.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-msa.cfg @@ -6,37 +6,37 @@ %% %% microtype.dtx (with options: `config,cfg-u,msa') %% -%% ----------------------------------------------------------------------- -%% The `microtype' package +%% ------------------------------------------------------------------------ +%% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX %% Copyright (c) 2004--2006 R Schlicht <w.m.l@gmx.net> %% -%% This work may be distributed and/or modified under the conditions of -%% the LaTeX Project Public License, either version 1.3 of this license or -%% (at your option) any later version. The latest version of this license -%% is in: http://www.latex-project.org/lppl.txt, and version 1.3 or later -%% is part of all distributions of LaTeX version 2003/12/01 or later. +%% This work may be distributed and/or modified under the conditions of the +%% LaTeX Project Public License, either version 1.3c of this license or (at +%% your option) any later version. The latest version of this license is in: +%% http://www.latex-project.org/lppl.txt, and version 1.3c or later is part +%% of all distributions of LaTeX version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `author-maintained'. %% %% This work consists of the files microtype.dtx and microtype.ins and the %% derived file microtype.sty. %% -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' -%% package. It contains settings for font expansion and character +%% package. It may contain settings for font expansion and character %% protrusion. Please consult the documentation for details. %% %% If you think you have found improvements to these settings, please %% let me know. %% %% When modifying this file, also change the identification line below. -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% \ProvidesFile - {mt-msa.cfg}[2006/02/04 v1.1 microtype config. file: AMS (a) (RS)] + {mt-msa.cfg}[2006/02/04 v1.1 microtype config. file: AMS symbols (a) (RS)] -%%% ---------------------------------------------------------------------- +%%% ----------------------------------------------------------------------- %%% PROTRUSION SETTINGS \SetProtrusion diff --git a/Master/texmf-dist/tex/latex/microtype/mt-msb.cfg b/Master/texmf-dist/tex/latex/microtype/mt-msb.cfg index a94bf45b07f..2d3aabd41f0 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-msb.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-msb.cfg @@ -6,37 +6,37 @@ %% %% microtype.dtx (with options: `config,cfg-u,msb') %% -%% ----------------------------------------------------------------------- -%% The `microtype' package +%% ------------------------------------------------------------------------ +%% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX %% Copyright (c) 2004--2006 R Schlicht <w.m.l@gmx.net> %% -%% This work may be distributed and/or modified under the conditions of -%% the LaTeX Project Public License, either version 1.3 of this license or -%% (at your option) any later version. The latest version of this license -%% is in: http://www.latex-project.org/lppl.txt, and version 1.3 or later -%% is part of all distributions of LaTeX version 2003/12/01 or later. +%% This work may be distributed and/or modified under the conditions of the +%% LaTeX Project Public License, either version 1.3c of this license or (at +%% your option) any later version. The latest version of this license is in: +%% http://www.latex-project.org/lppl.txt, and version 1.3c or later is part +%% of all distributions of LaTeX version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `author-maintained'. %% %% This work consists of the files microtype.dtx and microtype.ins and the %% derived file microtype.sty. %% -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' -%% package. It contains settings for font expansion and character +%% package. It may contain settings for font expansion and character %% protrusion. Please consult the documentation for details. %% %% If you think you have found improvements to these settings, please %% let me know. %% %% When modifying this file, also change the identification line below. -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% \ProvidesFile - {mt-msb.cfg}[2005/06/01 v1.0 microtype config. file: AMS (b) (RS)] + {mt-msb.cfg}[2005/06/01 v1.0 microtype config. file: AMS symbols (b) (RS)] -%%% ---------------------------------------------------------------------- +%%% ----------------------------------------------------------------------- %%% PROTRUSION SETTINGS \SetProtrusion diff --git a/Master/texmf-dist/tex/latex/microtype/mt-mvs.cfg b/Master/texmf-dist/tex/latex/microtype/mt-mvs.cfg index ab2f1aa2893..f2198f8dad0 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-mvs.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-mvs.cfg @@ -6,54 +6,57 @@ %% %% microtype.dtx (with options: `config,cfg-e,mvs') %% -%% ----------------------------------------------------------------------- -%% The `microtype' package +%% ------------------------------------------------------------------------ +%% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX %% Copyright (c) 2004--2006 R Schlicht <w.m.l@gmx.net> %% -%% This work may be distributed and/or modified under the conditions of -%% the LaTeX Project Public License, either version 1.3 of this license or -%% (at your option) any later version. The latest version of this license -%% is in: http://www.latex-project.org/lppl.txt, and version 1.3 or later -%% is part of all distributions of LaTeX version 2003/12/01 or later. +%% This work may be distributed and/or modified under the conditions of the +%% LaTeX Project Public License, either version 1.3c of this license or (at +%% your option) any later version. The latest version of this license is in: +%% http://www.latex-project.org/lppl.txt, and version 1.3c or later is part +%% of all distributions of LaTeX version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `author-maintained'. %% %% This work consists of the files microtype.dtx and microtype.ins and the %% derived file microtype.sty. %% -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' -%% package. It contains settings for font expansion and character +%% package. It may contain settings for font expansion and character %% protrusion. Please consult the documentation for details. %% %% If you think you have found improvements to these settings, please %% let me know. %% %% When modifying this file, also change the identification line below. -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% \ProvidesFile - {mt-mvs.cfg}[2006/05/04 v1.0 microtype config. file: Marvosym Euro (RS)] + {mt-mvs.cfg}[2006/07/05 v1.1 microtype config. file: Marvosym Euro (RS)] -%%% ---------------------------------------------------------------------- +%%% ----------------------------------------------------------------------- %%% CHARACTER INHERITANCE \DeclareCharacterInheritance { encoding = OT1, family = mvs } - { - 164 = {099,100,101} % \EURhv,\EURcr,\EURtm - } + { 164 = {099,100,101} } % \EURhv,\EURcr,\EURtm + +\DeclareCharacterInheritance + { encoding = U, + family = mvs } + { 164 = {099,100,101} } -%%% ---------------------------------------------------------------------- +%%% ----------------------------------------------------------------------- %%% PROTRUSION SETTINGS \SetProtrusion - { encoding = OT1, + { encoding = {OT1,U}, family = mvs } { - 164 = {50,50} % \EUR + 164 = {50,50}, % \EUR 068 = {50,-100}, % \EURdig } diff --git a/Master/texmf-dist/tex/latex/microtype/mt-pad.cfg b/Master/texmf-dist/tex/latex/microtype/mt-pad.cfg index fd96b49f5dc..06caa1d0c6d 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-pad.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-pad.cfg @@ -6,37 +6,37 @@ %% %% microtype.dtx (with options: `config,cfg-t,pad') %% -%% ----------------------------------------------------------------------- -%% The `microtype' package +%% ------------------------------------------------------------------------ +%% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX %% Copyright (c) 2004--2006 R Schlicht <w.m.l@gmx.net> %% -%% This work may be distributed and/or modified under the conditions of -%% the LaTeX Project Public License, either version 1.3 of this license or -%% (at your option) any later version. The latest version of this license -%% is in: http://www.latex-project.org/lppl.txt, and version 1.3 or later -%% is part of all distributions of LaTeX version 2003/12/01 or later. +%% This work may be distributed and/or modified under the conditions of the +%% LaTeX Project Public License, either version 1.3c of this license or (at +%% your option) any later version. The latest version of this license is in: +%% http://www.latex-project.org/lppl.txt, and version 1.3c or later is part +%% of all distributions of LaTeX version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `author-maintained'. %% %% This work consists of the files microtype.dtx and microtype.ins and the %% derived file microtype.sty. %% -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' -%% package. It contains settings for font expansion and character +%% package. It may contain settings for font expansion and character %% protrusion. Please consult the documentation for details. %% %% If you think you have found improvements to these settings, please %% let me know. %% %% When modifying this file, also change the identification line below. -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% \ProvidesFile {mt-pad.cfg}[2005/11/07 v1.5 microtype config. file: Adobe Garamond (RS)] -%%% ---------------------------------------------------------------------- +%%% ----------------------------------------------------------------------- %%% PROTRUSION SETTINGS \SetProtrusion diff --git a/Master/texmf-dist/tex/latex/microtype/mt-pmn.cfg b/Master/texmf-dist/tex/latex/microtype/mt-pmn.cfg index 24005a06a21..419284da9dc 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-pmn.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-pmn.cfg @@ -6,42 +6,42 @@ %% %% microtype.dtx (with options: `config,cfg-t,pmn') %% -%% ----------------------------------------------------------------------- -%% The `microtype' package +%% ------------------------------------------------------------------------ +%% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX %% Copyright (c) 2004--2006 R Schlicht <w.m.l@gmx.net> %% -%% This work may be distributed and/or modified under the conditions of -%% the LaTeX Project Public License, either version 1.3 of this license or -%% (at your option) any later version. The latest version of this license -%% is in: http://www.latex-project.org/lppl.txt, and version 1.3 or later -%% is part of all distributions of LaTeX version 2003/12/01 or later. +%% This work may be distributed and/or modified under the conditions of the +%% LaTeX Project Public License, either version 1.3c of this license or (at +%% your option) any later version. The latest version of this license is in: +%% http://www.latex-project.org/lppl.txt, and version 1.3c or later is part +%% of all distributions of LaTeX version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `author-maintained'. %% %% This work consists of the files microtype.dtx and microtype.ins and the %% derived file microtype.sty. %% -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' -%% package. It contains settings for font expansion and character +%% package. It may contain settings for font expansion and character %% protrusion. Please consult the documentation for details. %% %% If you think you have found improvements to these settings, please %% let me know. %% %% When modifying this file, also change the identification line below. -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% %% These settings have been prepared by, and are copied with the %% generous permission of: Harald Harders <h.harders{at}tu-bs.de>. %% -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% \ProvidesFile {mt-pmn.cfg}[2004/11/07 v1.2 microtype config. file: Adobe Minion (HH)] -%%% ---------------------------------------------------------------------- +%%% ----------------------------------------------------------------------- %%% PROTRUSION SETTINGS \SetProtrusion diff --git a/Master/texmf-dist/tex/latex/microtype/mt-ppl.cfg b/Master/texmf-dist/tex/latex/microtype/mt-ppl.cfg index 45d1f93dad4..f0f5faead00 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-ppl.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-ppl.cfg @@ -6,37 +6,37 @@ %% %% microtype.dtx (with options: `config,cfg-t,ppl') %% -%% ----------------------------------------------------------------------- -%% The `microtype' package +%% ------------------------------------------------------------------------ +%% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX %% Copyright (c) 2004--2006 R Schlicht <w.m.l@gmx.net> %% -%% This work may be distributed and/or modified under the conditions of -%% the LaTeX Project Public License, either version 1.3 of this license or -%% (at your option) any later version. The latest version of this license -%% is in: http://www.latex-project.org/lppl.txt, and version 1.3 or later -%% is part of all distributions of LaTeX version 2003/12/01 or later. +%% This work may be distributed and/or modified under the conditions of the +%% LaTeX Project Public License, either version 1.3c of this license or (at +%% your option) any later version. The latest version of this license is in: +%% http://www.latex-project.org/lppl.txt, and version 1.3c or later is part +%% of all distributions of LaTeX version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `author-maintained'. %% %% This work consists of the files microtype.dtx and microtype.ins and the %% derived file microtype.sty. %% -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' -%% package. It contains settings for font expansion and character +%% package. It may contain settings for font expansion and character %% protrusion. Please consult the documentation for details. %% %% If you think you have found improvements to these settings, please %% let me know. %% %% When modifying this file, also change the identification line below. -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% \ProvidesFile {mt-ppl.cfg}[2005/11/16 v1.6 microtype config. file: Palatino (RS)] -%%% ---------------------------------------------------------------------- +%%% ----------------------------------------------------------------------- %%% PROTRUSION SETTINGS \SetProtrusion diff --git a/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg b/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg index db5283e7526..d6a4941e096 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg @@ -6,37 +6,37 @@ %% %% microtype.dtx (with options: `config,cfg-t,ptm') %% -%% ----------------------------------------------------------------------- -%% The `microtype' package +%% ------------------------------------------------------------------------ +%% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX %% Copyright (c) 2004--2006 R Schlicht <w.m.l@gmx.net> %% -%% This work may be distributed and/or modified under the conditions of -%% the LaTeX Project Public License, either version 1.3 of this license or -%% (at your option) any later version. The latest version of this license -%% is in: http://www.latex-project.org/lppl.txt, and version 1.3 or later -%% is part of all distributions of LaTeX version 2003/12/01 or later. +%% This work may be distributed and/or modified under the conditions of the +%% LaTeX Project Public License, either version 1.3c of this license or (at +%% your option) any later version. The latest version of this license is in: +%% http://www.latex-project.org/lppl.txt, and version 1.3c or later is part +%% of all distributions of LaTeX version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `author-maintained'. %% %% This work consists of the files microtype.dtx and microtype.ins and the %% derived file microtype.sty. %% -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' -%% package. It contains settings for font expansion and character +%% package. It may contain settings for font expansion and character %% protrusion. Please consult the documentation for details. %% %% If you think you have found improvements to these settings, please %% let me know. %% %% When modifying this file, also change the identification line below. -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% \ProvidesFile {mt-ptm.cfg}[2006/04/20 v1.7 microtype config. file: Times (RS)] -%%% ---------------------------------------------------------------------- +%%% ----------------------------------------------------------------------- %%% PROTRUSION SETTINGS \SetProtrusion @@ -121,7 +121,7 @@ \textalpha = { , 50}, \textDelta = { 70, 70}, \textpi = { 50, 80}, \textSigma = { , 70}, \textmu = { , 80}, \texteuro = { 50, 50}, - \textellipsis = {175,175}, \textasciitilde = { 80, 80}, + \textellipsis = {150,200}, \textasciitilde = { 80, 80}, \textapprox = { 50, 50}, \textinfty = {100,100}, \textdagger = {150,150}, \textdaggerdbl = {100,100}, \textdiv = { 50,150}, \textsection = { 80, 80}, @@ -143,7 +143,7 @@ \textcopyright = {100,100}, \textdegree = {300,300}, \textminus = {200,200}, - \textellipsis = {100,100}, + \textellipsis = {150,200}, \texteuro = { , }, % ? \textcent = {100,100}, \textquotesingle = {500,500}, @@ -259,7 +259,7 @@ \textregistered = {100,150}, \copyright = {100,150}, \textDelta = { 70, }, \textdelta = { , 50}, \textpi = { 50, 80}, \textmu = { , 80}, - \texteuro = {200, }, \textellipsis = {100,150}, + \texteuro = {200, }, \textellipsis = {100,200}, \textquoteleft = {500,400}, \textquoteright = {500,400}, \textquotedblleft = {500,300}, \textquotedblright = {400,400}, \textapprox = { 50, 50}, \textinfty = {100,100}, @@ -284,7 +284,7 @@ \textcopyright = {100,100}, \textdegree = {300,100}, \textminus = {200,200}, - \textellipsis = {100,150}, + \textellipsis = {100,200}, \texteuro = { , }, \textcent = {100,100}, \textquotesingle = {500, }, diff --git a/Master/texmf-dist/tex/latex/microtype/mt-ugm.cfg b/Master/texmf-dist/tex/latex/microtype/mt-ugm.cfg index ab9eb03ee07..c5e34a8c8b1 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-ugm.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-ugm.cfg @@ -6,37 +6,37 @@ %% %% microtype.dtx (with options: `config,cfg-t,ugm') %% -%% ----------------------------------------------------------------------- -%% The `microtype' package +%% ------------------------------------------------------------------------ +%% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX %% Copyright (c) 2004--2006 R Schlicht <w.m.l@gmx.net> %% -%% This work may be distributed and/or modified under the conditions of -%% the LaTeX Project Public License, either version 1.3 of this license or -%% (at your option) any later version. The latest version of this license -%% is in: http://www.latex-project.org/lppl.txt, and version 1.3 or later -%% is part of all distributions of LaTeX version 2003/12/01 or later. +%% This work may be distributed and/or modified under the conditions of the +%% LaTeX Project Public License, either version 1.3c of this license or (at +%% your option) any later version. The latest version of this license is in: +%% http://www.latex-project.org/lppl.txt, and version 1.3c or later is part +%% of all distributions of LaTeX version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `author-maintained'. %% %% This work consists of the files microtype.dtx and microtype.ins and the %% derived file microtype.sty. %% -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' -%% package. It contains settings for font expansion and character +%% package. It may contain settings for font expansion and character %% protrusion. Please consult the documentation for details. %% %% If you think you have found improvements to these settings, please %% let me know. %% %% When modifying this file, also change the identification line below. -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% \ProvidesFile {mt-ugm.cfg}[2006/01/26 v1.0 microtype config. file: URW Garamond (RS)] -%%% ---------------------------------------------------------------------- +%%% ----------------------------------------------------------------------- %%% PROTRUSION SETTINGS \SetProtrusion diff --git a/Master/texmf-dist/tex/latex/microtype/mt-zpeu.cfg b/Master/texmf-dist/tex/latex/microtype/mt-zpeu.cfg index 3399715a3fe..2d0634b3292 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-zpeu.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-zpeu.cfg @@ -6,47 +6,45 @@ %% %% microtype.dtx (with options: `config,cfg-e,zpeu') %% -%% ----------------------------------------------------------------------- -%% The `microtype' package +%% ------------------------------------------------------------------------ +%% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX %% Copyright (c) 2004--2006 R Schlicht <w.m.l@gmx.net> %% -%% This work may be distributed and/or modified under the conditions of -%% the LaTeX Project Public License, either version 1.3 of this license or -%% (at your option) any later version. The latest version of this license -%% is in: http://www.latex-project.org/lppl.txt, and version 1.3 or later -%% is part of all distributions of LaTeX version 2003/12/01 or later. +%% This work may be distributed and/or modified under the conditions of the +%% LaTeX Project Public License, either version 1.3c of this license or (at +%% your option) any later version. The latest version of this license is in: +%% http://www.latex-project.org/lppl.txt, and version 1.3c or later is part +%% of all distributions of LaTeX version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `author-maintained'. %% %% This work consists of the files microtype.dtx and microtype.ins and the %% derived file microtype.sty. %% -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' -%% package. It contains settings for font expansion and character +%% package. It may contain settings for font expansion and character %% protrusion. Please consult the documentation for details. %% %% If you think you have found improvements to these settings, please %% let me know. %% %% When modifying this file, also change the identification line below. -%% ----------------------------------------------------------------------- +%% ------------------------------------------------------------------------ %% \ProvidesFile {mt-zpeu.cfg}[2006/05/04 v1.0 microtype config. file: Adobe Euro (RS)] -%%% ---------------------------------------------------------------------- +%%% ----------------------------------------------------------------------- %%% CHARACTER INHERITANCE \DeclareCharacterInheritance { encoding = U, family = {zpeu,zpeus,eurosans} } - { - E = 128 - } + { E = 128 } -%%% ---------------------------------------------------------------------- +%%% ----------------------------------------------------------------------- %%% PROTRUSION SETTINGS \SetProtrusion |