diff options
Diffstat (limited to 'Master/texmf-dist/tex')
29 files changed, 2771 insertions, 421 deletions
diff --git a/Master/texmf-dist/tex/latex/microtype/letterspace.sty b/Master/texmf-dist/tex/latex/microtype/letterspace.sty index 01ccca6cf68..37cba00b077 100644 --- a/Master/texmf-dist/tex/latex/microtype/letterspace.sty +++ b/Master/texmf-dist/tex/latex/microtype/letterspace.sty @@ -18,11 +18,12 @@ %% 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 has the LPPL maintenance status `maintained'. %% -%% This work consists of the files microtype.dtx and microtype.ins and the -%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, -%% microtype-xetex.def, microtype.lua and letterspace.sty. +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. %% %% ------------------------------------------------------------------------ %% This is a stand-alone version that only provides the letterspacing @@ -33,7 +34,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage {letterspace} - [2021/03/14 v2.8c + [2021/10/31 v3.0 Robust letterspacing (RS)] \def\MT@MT @@ -157,6 +158,10 @@ \let\MT@tr@max\@m \let\MT@letterspace\m@ne \def\MT@letterspace@default{100} +\MT@pdf@or@lua\relax{ +\ifx\newluafunction\@undefined \input ltluatex \fi +\MT@lua{require("microtype")} +} \def\MT@glet{\global\let} \def\MT@exp@cs#1#2{\expandafter#1\csname#2\endcsname} \def\MT@edef@n{\MT@exp@cs\edef} @@ -229,12 +234,8 @@ } \MT@pdf@or@lua{\let\MT@if@luaotf@font\@secondoftwo}{ \def\MT@if@luaotf@font{\csname\MT@lua{% - local thefont = font.getfont(font.current()) - if thefont and ( thefont.format == "opentype" or thefont.format == "truetype" ) - then tex.write("@firstoftwo") - else tex.write("@secondoftwo") - end - }\endcsname + microtype.if_luaotf_font() + }\endcsname } } \def\MT@do@font{\MT@while@num\z@\@cclvi} @@ -274,10 +275,7 @@ \expandafter\ifx\MT@lsfont\relax \MT@get@ls@basefont \MT@if@luaotf@font{% - \ifnum\MT@letterspace@<\z@\def\MT@minus{-}\else\let\MT@minus\@empty\fi - \global\expandafter\font\MT@lsfont=% - \expandafter\MT@exp@two@c\expandafter\MT@ls@fontspec@font - \expandafter\fontname\expandafter\font@name\space \@nil + \global\expandafter\font\MT@lsfont=\MT@ls@fontspec@font }{% \global\expandafter\letterspacefont\MT@lsfont\font@name\MT@letterspace@ }% @@ -315,14 +313,8 @@ {MT@aftergroup@\number\currentgrouplevel}% }% } -\def\MT@ls@fontspec@colon#1:#2:#3:#4\@nil{\ifx\\#3\\#1:#2\else#1:#2:#3\fi} -\def\MT@ls@fontspec@font#1 #2\@nil{% - "\MT@ls@fontspec@colon#1:::\relax\@nil - kernfactor=\MT@minus \ifnum\MT@letterspace@=1000 1\else 0.% - \ifnum\MT@minus\MT@letterspace@<100 0\fi - \ifnum\MT@minus\MT@letterspace@<10 0\fi - \number\MT@minus\MT@letterspace@ \fi;" - \ifx\\#2\\ at \f@size pt\else#2\fi\relax +\def\MT@ls@fontspec@font{% + \MT@lua{microtype.add_ls([[\MT@letterspace@]])}% } \MT@requires@latex2{ \def\MT@set@lsfont{\MT@exp@two@c\let\font@name\MT@lsfont} @@ -397,11 +389,11 @@ \def\MT@ls@too@large#1{% \ifnum#1>\MT@tr@max \MT@warning{Maximum for option `letterspace' is \number\MT@tr@max}% - \let#1\MT@tr@max + \edef#1{\number\MT@tr@max}% \else \ifnum#1<\MT@tr@min \MT@warning{Minimum for option `letterspace' is \number\MT@tr@min}% - \let#1\MT@tr@min + \edef#1{\number\MT@tr@min}% \fi \fi } diff --git a/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def b/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def index 8e0b2f954ba..144ecdf2fc8 100644 --- a/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def +++ b/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def @@ -4,7 +4,7 @@ %% %% The original source files were: %% -%% microtype.dtx (with options: `luatex-def') +%% microtype.dtx (with options: `lua-') %% %% ------------------------------------------------------------------------ %% @@ -18,11 +18,12 @@ %% 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 has the LPPL maintenance status `maintained'. %% -%% This work consists of the files microtype.dtx and microtype.ins and the -%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, -%% microtype-xetex.def, microtype.lua and letterspace.sty. +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. %% %% ------------------------------------------------------------------------ %% This file contains enginge-specific definitions. @@ -30,7 +31,7 @@ %% \ProvidesFile {microtype-luatex.def} - [2021/03/14 v2.8c + [2021/10/31 v3.0 Definitions specific to luatex (RS)] @@ -66,7 +67,7 @@ \def\MT@ifstreq#1#2{\csname\MT@lua{microtype.if_str_eq([[#1]],[[#2]])}\endcsname} \def\MT@if@luaotf@font{\csname\MT@lua{% microtype.if_luaotf_font() - }\endcsname + }\endcsname } \def\MT@do@font#1{% \MT@if@luaotf@font{% @@ -156,13 +157,12 @@ \MT@requires@luatex4{\pdffeedback fontsize}{\pdffontsize}\MT@font \MT@info{Fixing zero \string\fontdimen 6 for font `\MT@@font'\MessageBreak (new value: \the\fontdimen6\MT@font)}% - \MT@glet@nc{\MT@@font-fake6}\@empty \fi \edef\MT@dimen@six{\number\fontdimen6\MT@font}% } -\def\MT@protrusion{\MT@maybe@do{pr}} -\def\MT@set@pr@codes{% - \MT@nofamilyfalse +\def\MT@set@pr@codes + {% + \MT@nofamilyfalse \MT@if@list@exists{% \ifMT@nofamily \MT@ifdefined@n@TF{\MT@encoding-\MT@family-settings}\relax{% @@ -181,7 +181,9 @@ \MT@set@listname \MT@let@cn\@tempc{MT@pr@c@\MT@pr@c@name}% \expandafter\MT@set@codes\@tempc,\relax,% - }\MT@reset@pr@codes + \MT@set@pr@prefixheirs + }% + \MT@reset@pr@codes } \def\MT@set@all@pr#1#2{% \let\MT@temp\@empty @@ -213,15 +215,17 @@ \fi \fi } -\def\MT@pr@split@val#1,#2\relax{% - \def\@tempb{#1}% - \MT@ifempty\@tempb\relax{% - \MT@scale@to@em +\def\MT@pr@split@val#1,#2\relax + {\def\@tempb{#1}% + \MT@ifempty\@tempb + \relax + {\MT@scale@to@em \lpcode\MT@font\MT@char=\MT@the@pr@code }% \def\@tempb{#2}% - \MT@ifempty\@tempb\relax{% - \MT@scale@to@em + \MT@ifempty\@tempb + \relax + {\MT@scale@to@em \rpcode\MT@font\MT@char=\MT@the@pr@code }% \MT@ifdefined@c@T\MT@pr@inh@name{% @@ -243,41 +247,31 @@ \MT@count=\fontcharwd\MT@font\MT@char\relax \ifnum\MT@count=\z@ \MT@info@missing@char \fi } -\def\MT@set@pr@heirs#1{% - \lpcode\MT@font #1=\lpcode\MT@font\MT@char\relax - \rpcode\MT@font #1=\rpcode\MT@font\MT@char\relax -} -\def\MT@preset@pr{% - \expandafter\expandafter\expandafter\MT@preset@pr@ - \csname MT@pr@c@\MT@pr@c@name @preset\endcsname\@nil -} -\def\MT@preset@pr@#1,#2\@nil{% - \ifx\MT@pr@unit@\@empty - \MT@warn@preset@towidth{pr}% - \let\MT@preset@aux\MT@preset@aux@factor - \else - \def\MT@preset@aux{\MT@preset@aux@space2}% +\def\MT@set@pr@prefixes#1{\MT@set@pr@prefixes@#1} +\def\MT@set@pr@prefixes@#1#2#3#4% + {% + \@tempcnta=\z@ + \ifnum#3>\z@ + \@tempcnta=\numexpr + (\fontcharwd\MT@font#2-\fontcharwd\MT@font#1)% + *#3/\MT@dimen@six\relax \fi - \MT@ifempty{#1}{\let\@tempa\@empty}{\MT@preset@aux{#1}\@tempa}% - \MT@ifempty{#2}{\let\@tempb\@empty}{\MT@preset@aux{#2}\@tempb}% - \MT@set@all@pr\@tempa\@tempb -} -\def\MT@preset@aux@factor#1#2{% - \@tempcntb=#1\relax - \MT@scale@factor - \edef#2{\number\@tempcntb}% -} -\def\MT@preset@aux@space#1#2#3{% - \def\@tempb{#2}% - \MT@get@space@unit#1% - \MT@scale@to@em - \edef#3{\number\@tempcntb}% + \lpcode\MT@font #2=\numexpr\lpcode\MT@font#1+\@tempcnta\relax + \@tempcnta=\z@ + \ifnum#4>\z@ + \@tempcnta=\numexpr + (\fontcharwd\MT@font#2-\fontcharwd\MT@font#1)% + *#4/\MT@dimen@six\relax + \fi + \rpcode\MT@font #2=\numexpr\rpcode\MT@font#1+\@tempcnta\relax } -\def\MT@warn@preset@towidth#1{% - \MT@warning@nl{% - Cannot preset characters relative to their widths\MessageBreak - for \@nameuse{MT@abbr@#1} list `\@nameuse{MT@#1@c@name}'. Presetting them% - \MessageBreak relative to 1em instead}% +\def\MT@prot@addtoken@next#1{% + \edef\MT@temp{\MT@toks={\the\MT@toks\noexpand#1}}\MT@temp + \setbox\MT@tempbox\hbox{\the\MT@toks + }\setbox\MT@tempbox\hbox{\unhbox\MT@tempbox + \ifnum\lastnodetype=7 \aftergroup\@firstoftwo\else\aftergroup\@secondoftwo\fi}% + \MT@prot@get@nextchar + {\MT@prot@l{\the\MT@toks}}% } \def\MT@expansion{\MT@maybe@do{ex}} \def\MT@set@ex@codes@s{% @@ -416,15 +410,6 @@ \MT@tracking@ \def\MT@set@tr@codes{% \MT@vinfo{Tracking font `\MT@@font'\on@line}% - \MT@ifdefined@n@TF{\MT@@font-fake6}{% - \expandafter\ifx\csname\MT@@font-fake6\endcsname\@empty - \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}% - \MT@glet@nc{\MT@@font-fake6}\relax - \fi - }{% \MT@if@list@exists \MT@get@tr@opt \relax @@ -439,10 +424,7 @@ \expandafter\ifx\MT@lsfont\relax \MT@get@ls@basefont \MT@if@luaotf@font{% - \ifnum\MT@letterspace@<\z@\def\MT@minus{-}\else\let\MT@minus\@empty\fi - \global\expandafter\font\MT@lsfont=% - \expandafter\MT@exp@two@c\expandafter\MT@ls@fontspec@font - \expandafter\fontname\expandafter\font@name\space \@nil + \global\expandafter\font\MT@lsfont=\MT@ls@fontspec@font }{% \global\expandafter\letterspacefont\MT@lsfont\font@name\MT@letterspace@ }% @@ -487,7 +469,6 @@ \noexpand\MT@tr@outer@r }% \fi - }% } \def\MT@afteraftergroup#1{% \MT@maybe@gobble@with@tikz{% @@ -499,14 +480,8 @@ }% }% } -\def\MT@ls@fontspec@colon#1:#2:#3:#4\@nil{\ifx\\#3\\#1:#2\else#1:#2:#3\fi} -\def\MT@ls@fontspec@font#1 #2\@nil{% - "\MT@ls@fontspec@colon#1:::\relax\@nil - kernfactor=\MT@minus \ifnum\MT@letterspace@=1000 1\else 0.% - \ifnum\MT@minus\MT@letterspace@<100 0\fi - \ifnum\MT@minus\MT@letterspace@<10 0\fi - \number\MT@minus\MT@letterspace@ \fi;" - \ifx\\#2\\ at \f@size pt\else#2\fi\relax +\def\MT@ls@fontspec@font{% + \MT@lua{microtype.add_ls([[\MT@letterspace@]])}% } \def\MT@get@tr@opt{% \MT@set@listname @@ -965,6 +940,7 @@ \def\MT@inh@split#1=#2=#3\relax{% \def\@tempa{#1}% \ifx\@tempa\@empty \else + \expandafter\MT@has@inh@prefix\@tempa()\relax\@nil \MT@get@slot \ifnum\MT@char > \m@ne \let\MT@val\MT@char @@ -973,13 +949,42 @@ \ifx\@tempa\@empty \else \MT@get@slot \ifnum\MT@char > \m@ne - \MT@exp@cs\MT@xadd{MT@inh@\MT@listname @\MT@val @}{{\MT@char}}% + \ifx\MT@inh@prefix\@empty + \MT@exp@cs\MT@xadd{MT@inh@\MT@listname @\MT@val @}{{\MT@char}}% + \else + \MT@exp@cs\MT@xadd{MT@inh@\MT@listname @prefixes}% + {{{\MT@val}{\MT@char}\MT@inh@prefix@}}% + \fi \fi \fi }% \fi \fi } +\def\MT@has@inh@prefix#1(#2)#3#4\@nil{% + \let\MT@temp\relax + \ifx\relax#3% + \def\@tempa{#1#2}% + \let\MT@inh@prefix\@empty + \else + \MT@ifstreq{\MT@feat}{pr}{% + \MT@ifstreq{#2}{l}{\def\MT@inh@prefix@{{1000}{0}}\@firstoftwo}{% + \MT@ifstreq{#2}{r}{\def\MT@inh@prefix@{{0}{1000}}\@firstoftwo}{% + \MT@ifstreq{#2}{lr}{\def\MT@inh@prefix@{{500}{500}}\@firstoftwo}{% + \MT@warning@nl{`#2' is not a valid prefix in inheritance list% + \MessageBreak\MT@listname. Ignoring it}% + \@secondoftwo}}}% + {\def\@tempa{#3}% + \def\MT@inh@prefix{#2}% + \@gobble}% + {\@firstofone}% + }{\@firstofone}% + {\let\MT@char\m@ne + \let\MT@temp\@gobble + }% + \fi + \MT@temp +} \MT@requires@luatex4{\let\pdfoutput\outputmode}\relax \MT@def@bool@opt{DVIoutput}{% \csname if\@tempa\endcsname diff --git a/Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def b/Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def index ead3d149558..7bb387536b1 100644 --- a/Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def +++ b/Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def @@ -4,7 +4,7 @@ %% %% The original source files were: %% -%% microtype.dtx (with options: `pdftex-def') +%% microtype.dtx (with options: `pdf-') %% %% ------------------------------------------------------------------------ %% @@ -18,11 +18,12 @@ %% 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 has the LPPL maintenance status `maintained'. %% -%% This work consists of the files microtype.dtx and microtype.ins and the -%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, -%% microtype-xetex.def, microtype.lua and letterspace.sty. +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. %% %% ------------------------------------------------------------------------ %% This file contains enginge-specific definitions. @@ -30,14 +31,17 @@ %% \ProvidesFile {microtype-pdftex.def} - [2021/03/14 v2.8c + [2021/10/31 v3.0 Definitions specific to pdftex (RS)] -\def\MT@pdftex@no{7} +\def\MT@pdftex@no{8} \ifnum\pdftexversion = 140 - \ifnum\pdftexrevision < 4 - \def\MT@pdftex@no{6} + \ifnum\pdftexrevision < 23 + \def\MT@pdftex@no{7} + \ifnum\pdftexrevision < 4 + \def\MT@pdftex@no{6} + \fi \fi \else \ifnum\pdftexversion < 140 @@ -236,13 +240,13 @@ \pdffontsize\MT@font \MT@info{Fixing zero \string\fontdimen 6 for font `\MT@@font'\MessageBreak (new value: \the\fontdimen6\MT@font)}% - \MT@glet@nc{\MT@@font-fake6}\@empty + \MT@requires@pdftex8\relax{\MT@glet@nc{\MT@@font-fake6}\@empty}% \fi \edef\MT@dimen@six{\number\fontdimen6\MT@font}% } -\def\MT@protrusion{\MT@maybe@do{pr}} -\def\MT@set@pr@codes{% - \MT@nofamilyfalse +\def\MT@set@pr@codes + {% + \MT@nofamilyfalse \MT@if@list@exists{% \ifMT@nofamily \MT@ifdefined@n@TF{\MT@encoding-\MT@family-settings}\relax{% @@ -261,7 +265,9 @@ \MT@set@listname \MT@let@cn\@tempc{MT@pr@c@\MT@pr@c@name}% \expandafter\MT@set@codes\@tempc,\relax,% - }\MT@reset@pr@codes + \MT@set@pr@prefixheirs + }% + \MT@reset@pr@codes } \def\MT@set@all@pr#1#2{% \let\MT@temp\@empty @@ -293,15 +299,17 @@ \fi \fi } -\def\MT@pr@split@val#1,#2\relax{% - \def\@tempb{#1}% - \MT@ifempty\@tempb\relax{% - \MT@scale@to@em +\def\MT@pr@split@val#1,#2\relax + {\def\@tempb{#1}% + \MT@ifempty\@tempb + \relax + {\MT@scale@to@em \lpcode\MT@font\MT@char=\MT@the@pr@code }% \def\@tempb{#2}% - \MT@ifempty\@tempb\relax{% - \MT@scale@to@em + \MT@ifempty\@tempb + \relax + {\MT@scale@to@em \rpcode\MT@font\MT@char=\MT@the@pr@code }% \MT@ifdefined@c@T\MT@pr@inh@name{% @@ -341,41 +349,31 @@ } \def\MT@get@charwd{\MT@count=\MT@dimen@six} } -\def\MT@set@pr@heirs#1{% - \lpcode\MT@font #1=\lpcode\MT@font\MT@char\relax - \rpcode\MT@font #1=\rpcode\MT@font\MT@char\relax -} -\def\MT@preset@pr{% - \expandafter\expandafter\expandafter\MT@preset@pr@ - \csname MT@pr@c@\MT@pr@c@name @preset\endcsname\@nil -} -\def\MT@preset@pr@#1,#2\@nil{% - \ifx\MT@pr@unit@\@empty - \MT@warn@preset@towidth{pr}% - \let\MT@preset@aux\MT@preset@aux@factor - \else - \def\MT@preset@aux{\MT@preset@aux@space2}% +\def\MT@set@pr@prefixes#1{\MT@set@pr@prefixes@#1} +\def\MT@set@pr@prefixes@#1#2#3#4% + {% + \@tempcnta=\z@ + \ifnum#3>\z@ + \@tempcnta=\numexpr + (\fontcharwd\MT@font#2-\fontcharwd\MT@font#1)% + *#3/\MT@dimen@six\relax \fi - \MT@ifempty{#1}{\let\@tempa\@empty}{\MT@preset@aux{#1}\@tempa}% - \MT@ifempty{#2}{\let\@tempb\@empty}{\MT@preset@aux{#2}\@tempb}% - \MT@set@all@pr\@tempa\@tempb -} -\def\MT@preset@aux@factor#1#2{% - \@tempcntb=#1\relax - \MT@scale@factor - \edef#2{\number\@tempcntb}% -} -\def\MT@preset@aux@space#1#2#3{% - \def\@tempb{#2}% - \MT@get@space@unit#1% - \MT@scale@to@em - \edef#3{\number\@tempcntb}% + \lpcode\MT@font #2=\numexpr\lpcode\MT@font#1+\@tempcnta\relax + \@tempcnta=\z@ + \ifnum#4>\z@ + \@tempcnta=\numexpr + (\fontcharwd\MT@font#2-\fontcharwd\MT@font#1)% + *#4/\MT@dimen@six\relax + \fi + \rpcode\MT@font #2=\numexpr\rpcode\MT@font#1+\@tempcnta\relax } -\def\MT@warn@preset@towidth#1{% - \MT@warning@nl{% - Cannot preset characters relative to their widths\MessageBreak - for \@nameuse{MT@abbr@#1} list `\@nameuse{MT@#1@c@name}'. Presetting them% - \MessageBreak relative to 1em instead}% +\def\MT@prot@addtoken@next#1{% + \edef\MT@temp{\MT@toks={\the\MT@toks\noexpand#1}}\MT@temp + \setbox\MT@tempbox\hbox{\the\MT@toks + \relax + \ifnum\lastnodetype=7 \aftergroup\@firstoftwo\else\aftergroup\@secondoftwo\fi}% + \MT@prot@get@nextchar + {\MT@prot@l{\the\MT@toks}}% } \def\MT@expansion{\MT@maybe@do{ex}} \def\MT@set@ex@codes@s{% @@ -631,14 +629,16 @@ \MT@tracking@ \def\MT@set@tr@codes{% \MT@vinfo{Tracking font `\MT@@font'\on@line}% - \MT@ifdefined@n@TF{\MT@@font-fake6}{% - \expandafter\ifx\csname\MT@@font-fake6\endcsname\@empty - \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}% - \MT@glet@nc{\MT@@font-fake6}\relax - \fi + \MT@requires@pdftex8\@firstofone{% + \MT@ifdefined@n@TF{\MT@@font-fake6}{% + \expandafter\ifx\csname\MT@@font-fake6\endcsname\@empty + \MT@warning@nl{% + Font `\MT@@font' does not specify its\MessageBreak + \@backslashchar fontdimen 6 (width of an `em')! Therefore,\MessageBreak + tracking will not work with this font}% + \MT@glet@nc{\MT@@font-fake6}\relax + \fi + }% }{% \MT@if@list@exists \MT@get@tr@opt @@ -1214,6 +1214,7 @@ \def\MT@inh@split#1=#2=#3\relax{% \def\@tempa{#1}% \ifx\@tempa\@empty \else + \expandafter\MT@has@inh@prefix\@tempa()\relax\@nil \MT@get@slot \ifnum\MT@char > \m@ne \let\MT@val\MT@char @@ -1222,13 +1223,42 @@ \ifx\@tempa\@empty \else \MT@get@slot \ifnum\MT@char > \m@ne - \MT@exp@cs\MT@xadd{MT@inh@\MT@listname @\MT@val @}{{\MT@char}}% + \ifx\MT@inh@prefix\@empty + \MT@exp@cs\MT@xadd{MT@inh@\MT@listname @\MT@val @}{{\MT@char}}% + \else + \MT@exp@cs\MT@xadd{MT@inh@\MT@listname @prefixes}% + {{{\MT@val}{\MT@char}\MT@inh@prefix@}}% + \fi \fi \fi }% \fi \fi } +\def\MT@has@inh@prefix#1(#2)#3#4\@nil{% + \let\MT@temp\relax + \ifx\relax#3% + \def\@tempa{#1#2}% + \let\MT@inh@prefix\@empty + \else + \MT@ifstreq{\MT@feat}{pr}{% + \MT@ifstreq{#2}{l}{\def\MT@inh@prefix@{{1000}{0}}\@firstoftwo}{% + \MT@ifstreq{#2}{r}{\def\MT@inh@prefix@{{0}{1000}}\@firstoftwo}{% + \MT@ifstreq{#2}{lr}{\def\MT@inh@prefix@{{500}{500}}\@firstoftwo}{% + \MT@warning@nl{`#2' is not a valid prefix in inheritance list% + \MessageBreak\MT@listname. Ignoring it}% + \@secondoftwo}}}% + {\def\@tempa{#3}% + \def\MT@inh@prefix{#2}% + \@gobble}% + {\@firstofone}% + }{\@firstofone}% + {\let\MT@char\m@ne + \let\MT@temp\@gobble + }% + \fi + \MT@temp +} \MT@def@bool@opt{DVIoutput}{% \csname if\@tempa\endcsname \ifnum\pdfoutput>\z@ \MT@opt@DVItrue \fi diff --git a/Master/texmf-dist/tex/latex/microtype/microtype-show.sty b/Master/texmf-dist/tex/latex/microtype/microtype-show.sty new file mode 100644 index 00000000000..f52b167938f --- /dev/null +++ b/Master/texmf-dist/tex/latex/microtype/microtype-show.sty @@ -0,0 +1,367 @@ +%% +%% This is file `microtype-show.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% microtype.dtx (with options: `show') +%% +%% ------------------------------------------------------------------------ +%% +%% The `microtype' package +%% Subliminal refinements towards typographical perfection +%% Copyright (c) 2004--2021 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 `maintained'. +%% +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. +%% +%% ------------------------------------------------------------------------ +%% This companion package offers various commands that might be helpful +%% when creating protrusion settings. See the documentation in microtype's +%% User manual, section 10, and the examples in test-microtype.tex. +%% ------------------------------------------------------------------------ +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage + {microtype-show} + [2021/10/31 v3.0 + Visual debugging for the microtype package + (RS)] +\RequirePackage{iftex} +\ifetex\else + \PackageError{microtype-show} + {This package only works with e-TeX}{Use e-TeX} +\fi +\ifxetex + \PackageError{microtype-show} + {This package only works with pdfTeX or luaTeX}{Don't use XeTeX} +\fi +\PackageWarning{microtype-show}{DO NOT USE THIS PACKAGE FOR REAL DOCUMENTS\@gobble} +\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{microtype}} +\ProcessOptions\relax +\PassOptionsToPackage{verbose}{microtype} +\RequirePackage{microtype,graphicx,xcolor} +\newif\ifShowGlyphIndex +\newif\ifShowMissingGlyphs +\newcommand*\GlyphScaleFactor{2} +\newcommand*\Showbaselinecolor{\color{black!40}} +\newcommand*\Showposcolor{\color{green!50}} +\newcommand*\Shownegcolor{\color{red!50}} +\ifluatex + \def\MTS@printtext#1{{\usefont{TU}{lmr}{m}{n}#1}} +\else + \def\MTS@printtext#1{{\usefont{T1}{cmr}{m}{n}#1}} +\fi +\def\MTS@show@index#1{\ifShowGlyphIndex{\tiny$_{#1}% + % \ifluatex^{\mathrm{% + % \MT@lua{tex.print(luaotfload.aux.name_of_slot(tonumber([[#1]])))}}}\fi + $}\fi\space} +\def\MTS@crulefill{\leaders\hrule height \dimexpr1ex/2+.4pt depth -\dimexpr1ex/2\hfill} +\g@addto@macro\MT@setupfont{\MTS@Prot\MTS@Char} +\let\MTS@Prot\relax +\let\MTS@Char\relax +\def\MTS@setup{% + \fboxsep=0pt + \fboxrule=.1pt + \raggedright + \let\MTS@glyphlist\@gobble + \def\MT@feat{pr}% +} +\newcommand*\ShowProtrusion{% + \begingroup + \MTS@setup + \let\MTS@Prot\MTS@Prot@do + \def\MT@cat{c}% + \selectfont +} +\def\MTS@Prot@do{% + \MT@ltx@pickupfont + \let\MT@pr@split@val\MTS@pr@split@val + \let\MT@load@list\MTS@load@list + \let\MT@set@pr@prefixes@\MTS@set@pr@prefixes@ + \MTS@show@pr + \endgroup + \aftergroup\selectfont +} +\newcommand*\ShowCharacterInheritance{% + \begingroup + \MTS@setup + \let\MTS@Char\MTS@Char@do + \def\MT@cat{inh}% + \selectfont +} +\def\MTS@Char@do{% + \MT@ltx@pickupfont + \let\MT@set@pr@prefixes@\MTS@set@pr@prefixes@ + \MTS@show@inheritance + \endgroup + \aftergroup\selectfont +} +\newcommand*\ShowProtrusionLineGlyph[1]{% + {\MTS@setup + \MTS@showprotrusionline{`#1}}% +} +\newcommand*\ShowProtrusionLineIndex[1]{% + {\MTS@setup + \MTS@showprotrusionline{#1}}% +} +\def\MTS@showprotrusionline#1{% + \edef\MTS@lpcode{\number\lpcode\font#1}% + \edef\MTS@rpcode{\number\rpcode\font#1}% + \char#1% + lorem ipsum dolor sit amet, \MTS@crulefill\ % + \MTS@printtext{\ifnum\MTS@lpcode=\z@\Showbaselinecolor\fi[\MTS@lpcode]} + \fbox{\char#1}\MTS@show@index{\number#1} + \MTS@printtext{\ifnum\MTS@rpcode=\z@\Showbaselinecolor\fi[\MTS@rpcode]} + \MTS@crulefill\ you know the rest% + \char#1\par + \ShowDummyLine +} +\newcommand*\ShowDummyLine{% + {\fontencoding{\encodingdefault}\fontseries{\seriesdefault}\fontshape{\shapedefault}% + \selectfont\noindent + here is the beginning of a line, \dotfill and here is its end}\par +} +\newcommand*\ShowProtrusionAll{% + {\MTS@setup + \MTS@lede{}% + \MT@do@font{\iffontchar\font\@tempcnta\MTS@showprotrusionline{\@tempcnta}\fi}}% +} +\newcommand*\ShowProtrusionDefined{% + {\MTS@setup + \MTS@lede{defined}% + \let\MTS@first\@gobble + \let\MTS@second\@firstofone + \MT@do@font{% + \MTS@firstorsecond + \MTS@temp{% + \iffontchar\font\@tempcnta\MTS@showprotrusionline{\@tempcnta}\else + \MT@warning@nl{Glyph \the\@tempcnta\space is missing in font + \MessageBreak\font@name}% + \fi}}}% +} +\newcommand*\ShowProtrusionMissing{% + {\MTS@setup + \MTS@lede{missing}% + \let\MTS@first\@firstofone + \let\MTS@second\@gobble + \MT@do@font{% + \MTS@firstorsecond + \iffontchar\font\@tempcnta\MTS@temp{\MTS@showprotrusionline{\@tempcnta}}\fi}}% +} +\def\MTS@lede#1{% + \selectfont + \edef\MTS@font{\expandafter\string\font@name}% + \MTS@printtext{All glyphs \MT@ifempty{#1}{in}{#1 in protrusion list for} + font \texttt{\MTS@font}:}\par + \ShowDummyLine +} +\def\MTS@firstorsecond{% + \let\MTS@temp\MTS@first + \ifnum\lpcode\font\@tempcnta=\z@ \else + \let\MTS@temp\MTS@second + \fi + \ifnum\rpcode\font\@tempcnta=\z@ \else + \let\MTS@temp\MTS@second + \fi +} +\newdimen\MTS@charwd +\newdimen\MTS@lp@ +\newdimen\MTS@rp@ +\def\MTS@show@char@pr#1{% + \xdef\MTS@glyphlist{\MTS@glyphlist,#1}% + \scalebox{\GlyphScaleFactor}{\strut\escapechar`\\ + \MTS@charwd=\fontcharwd\MT@font#1\relax + {\Showbaselinecolor\vrule width \dimexpr\MTS@charwd+.3em\relax height 1sp depth 0pt}% + \hskip-\dimexpr\MTS@charwd+.15em\relax + {\ifdim\MTS@lp@<\z@\Shownegcolor\else\Showposcolor\fi + \vrule width \ifdim\MTS@lp@<\z@ -\fi\MTS@lp@ height 1em depth .2em}% + \hskip\dimexpr\MTS@charwd\ifdim\MTS@lp@>\z@-\MTS@lp@\fi + \ifdim\MTS@rp@>\z@-\MTS@rp@\fi\relax + {\ifdim\MTS@rp@<\z@\Shownegcolor\else\Showposcolor\fi + \vrule width \ifdim\MTS@rp@<\z@ -\fi\MTS@rp@ height 1em depth .2em}% + \hskip-\dimexpr\MTS@charwd+\fboxrule\ifdim\MTS@rp@<\z@-\MTS@rp@\fi\relax + \fbox{\char#1}}\,% + \MTS@show@index{#1}% +} +\def\MTS@show@char#1{\scalebox{\GlyphScaleFactor}{% + \strut\fbox{\char#1}}\MTS@show@index{#1}} +\def\MTS@show@char@x#1{\xdef\MTS@glyphlist{\MTS@glyphlist,#1}\MTS@show@char{#1}} +\def\MTS@show@missing{% + \MT@ifdefined@c@T\MT@pr@inh@name{% + \MTS@lp@=\z@ \MTS@rp@=\z@ + \par \MTS@printtext{Glyphs not included in configuration (with defined heirs):}% + \MT@do@font{% + \edef\MT@temp{\the\@tempcnta}% + \MT@ifdefined@n@T{MT@inh@\MT@pr@inh@name @\MT@temp @}{% + \MT@exp@one@n\MT@in@clist\MT@temp\MTS@glyphlist + \ifMT@inlist@\else \newline + \llap{\MTS@show@char@pr{\MT@temp} \MTS@printtext{=} }% + \MT@exp@cs\MT@map@tlist@c + {MT@inh@\MT@pr@inh@name @\the\@tempcnta @}% + \MTS@show@char@x + \fi + }% + }% + }% + \MTS@show@missing@ +} +\def\MTS@show@missing@{% + \par \MTS@printtext{Other glyphs not in configuration:}\newline + \MT@do@font{% + \edef\MT@temp{\the\@tempcnta}% + \MT@exp@one@n\MT@in@clist\MT@temp\MTS@glyphlist + \ifMT@inlist@\else + \MTS@show@char\MT@temp + \fi + }% +} +\def\MTS@show@inheritance{% + \MT@get@inh@list + \MTS@printtext{Character inheritance for font `\texttt{\MT@@font}':}\\ + \MT@ifdefined@c@TF\MT@listname{% + \MTS@printtext{First matching list is for `\texttt{\@tempa}':\\ + \texttt{\MT@listname}:}\par\leavevmode + \MT@do@font{% + \MT@ifdefined@n@T{MT@inh@\MT@listname @\the\@tempcnta @}{% + \newline + \xdef\MTS@glyphlist{\MTS@glyphlist,\the\@tempcnta}% + \llap{\MTS@show@char{\the\@tempcnta}\MTS@printtext{= }}% + \MT@exp@cs\MT@map@tlist@c + {MT@inh@\MT@listname @\the\@tempcnta @}% + \MTS@show@char@x + }% + }% + \MT@ifdefined@n@T{MT@inh@\MT@listname @prefixes}{% + \par \MTS@printtext{(with prefixes:)}% + \@tempcntb=\z@ + \let\MTS@show@char@pr\MTS@show@char@x + \MT@set@pr@prefixheirs}% + \ifShowMissingGlyphs\MTS@show@missing@\fi + }{% + \MTS@printtext{NOT DEFINED}% + }% + \par +} +\def\MTS@show@pr + {% + \MTS@printtext{Protrusion settings for font `\texttt{\MT@@font}':}\\ + \MT@if@list@exists{% + \MTS@printtext{First matching list is for `\texttt{\@tempa}':\\\texttt{\MT@pr@c@name}}% + \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,% + \vrule width 4cm height .5pt \\ + \MTS@printtext{End of list `\texttt{\MT@pr@c@name}'}\\[.5em] + \MT@ifdefined@c@T\MT@pr@inh@name{% + \MT@ifdefined@n@T{MT@inh@\MT@pr@inh@name @prefixes}{% + \par \MTS@printtext{(with prefixes:)}% + \@tempcntb=\z@ + \MT@set@pr@prefixheirs + }}% + \ifShowMissingGlyphs\MTS@show@missing\fi + }% + {\MTS@printtext{NOT DEFINED}% + \MT@reset@pr@codes + }\par +} +\def\MTS@pr@split@val#1,#2\relax + {\def\@tempb{#1}% + \MT@ifempty\@tempb + {\MTS@lp@=\z@ \let\MTS@lpcode\@empty}% + {\MT@scale@to@em + \MTS@lp@=\dimexpr\@tempcntb em/1000\relax\relax + \edef\MTS@lpcode{[\@tempb] \the\@tempcntb/\the\MTS@lp@}% + }% + \def\@tempb{#2}% + \MT@ifempty\@tempb + {\MTS@rp@=\z@ \let\MTS@rpcode\@empty}% + {\MT@scale@to@em + \MTS@rp@=\dimexpr\@tempcntb em/1000\relax\relax + \edef\MTS@rpcode{[\@tempb] \the\@tempcntb/\the\MTS@rp@}% + }% + \llap{\MTS@show@char@pr\MT@char\quad}% + \parbox[b][][b]{3.5cm}{\MTS@printtext{% + \footnotesize\makebox[.4cm][l]{L:} \MT@ifempty{\MTS@lpcode}{---}{\MTS@lpcode}\\ + \makebox[.4cm][l]{R:} \MT@ifempty{\MTS@rpcode}{---}{\MTS@rpcode}}}% + \parbox[t][][t]{\dimexpr\textwidth-3.5cm}{% + \MT@ifdefined@c@T\MT@pr@inh@name{% + \MT@ifdefined@n@T{MT@inh@\MT@pr@inh@name @\MT@char @}{% + \MT@exp@cs\MT@map@tlist@c + {MT@inh@\MT@pr@inh@name @\MT@char @}% + \MTS@show@char@pr + }% + }% + }\newline +} +\def\MTS@set@pr@prefixes@#1#2#3#4% + {% + \MTS@lp@=\z@ \MTS@rp@=\z@ + \ifnum#1=\@tempcntb \else + \par\leavevmode + \llap{\MTS@show@char@pr{#1} \MTS@printtext{=} }% + \fi + \@tempcnta=\z@ + \ifnum#3>\z@ + \@tempcnta=\numexpr + (\fontcharwd\MT@font#2-\fontcharwd\MT@font#1)% + *#3/\MT@dimen@six\relax + \fi + \MTS@lp@=\dimexpr\numexpr\lpcode\MT@font#1+\@tempcnta\relax em/1000\relax + \@tempcnta=\z@ + \ifnum#4>\z@ + \@tempcnta=\numexpr + (\fontcharwd\MT@font#2-\fontcharwd\MT@font#1)% + *#4/\MT@dimen@six\relax + \fi + \MTS@rp@=\dimexpr\numexpr\rpcode\MT@font#1+\@tempcnta\relax em/1000\relax + \MTS@show@char@pr{#2}% + \@tempcntb=#1\relax +} +\def\MTS@load@list#1% + {\edef\@tempa{#1}% + \MT@let@cn\@tempb{MT@\MT@feat @c@\@tempa @load}% + \MT@ifstreq\@tempa\@tempb{% + \MT@error{\@nameuse{MT@abbr@\MT@feat} list `\@tempa' cannot load itself}{}% + }{% + \ifx\@tempb\relax + :\par\medskip\leavevmode + \else + \MT@ifdefined@n@TF{MT@\MT@feat @c@\@tempb}{% + \MTS@printtext{, loading \texttt{\@tempb}}% + \MT@vinfo{... : First loading \@nameuse{MT@abbr@\MT@feat} list `\@tempb'}% + \begingroup + \MT@load@list\@tempb + \endgroup + \edef\MT@curr@list@name{% + `\@tempb'}% + \MT@let@cn\@tempc{MT@\MT@feat @c@\@tempb}% + \expandafter\MT@set@codes\@tempc,\relax,% + \vrule width 4cm height .5pt \\ + \MTS@printtext{End of list \texttt{\MT@curr@list@name}}% + \par\medskip\leavevmode + }{% + \MT@error{\@nameuse{MT@abbr@\MT@feat} list `\@tempb' undefined.\MessageBreak + Cannot load it from list `\@tempa'}{}% + }% + \fi + }% +} +\endinput +%% +%% End of file `microtype-show.sty'. diff --git a/Master/texmf-dist/tex/latex/microtype/microtype-xetex.def b/Master/texmf-dist/tex/latex/microtype/microtype-xetex.def index 4296c842aca..ae382dddc41 100644 --- a/Master/texmf-dist/tex/latex/microtype/microtype-xetex.def +++ b/Master/texmf-dist/tex/latex/microtype/microtype-xetex.def @@ -4,7 +4,7 @@ %% %% The original source files were: %% -%% microtype.dtx (with options: `xetex-def') +%% microtype.dtx (with options: `xe-') %% %% ------------------------------------------------------------------------ %% @@ -18,11 +18,12 @@ %% 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 has the LPPL maintenance status `maintained'. %% -%% This work consists of the files microtype.dtx and microtype.ins and the -%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, -%% microtype-xetex.def, microtype.lua and letterspace.sty. +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. %% %% ------------------------------------------------------------------------ %% This file contains enginge-specific definitions. @@ -30,7 +31,7 @@ %% \ProvidesFile {microtype-xetex.def} - [2021/03/14 v2.8c + [2021/10/31 v3.0 Definitions specific to xetex (RS)] @@ -128,13 +129,12 @@ \MT@size pt \MT@info{Fixing zero \string\fontdimen 6 for font `\MT@@font'\MessageBreak (new value: \the\fontdimen6\MT@font)}% - \MT@glet@nc{\MT@@font-fake6}\@empty \fi \edef\MT@dimen@six{\number\fontdimen6\MT@font}% } -\def\MT@protrusion{\MT@maybe@do{pr}} -\def\MT@set@pr@codes{% - \MT@nofamilyfalse +\def\MT@set@pr@codes + {% + \MT@nofamilyfalse \MT@if@list@exists{% \ifMT@nofamily \MT@ifdefined@n@TF{\MT@encoding-\MT@family-settings}\relax{% @@ -153,7 +153,9 @@ \MT@set@listname \MT@let@cn\@tempc{MT@pr@c@\MT@pr@c@name}% \expandafter\MT@set@codes\@tempc,\relax,% - }\MT@reset@pr@codes + \MT@set@pr@prefixheirs + }% + \MT@reset@pr@codes } \def\MT@set@all@pr#1#2{% \let\MT@temp\@empty @@ -180,15 +182,17 @@ \fi \fi } -\def\MT@pr@split@val#1,#2\relax{% - \def\@tempb{#1}% - \MT@ifempty\@tempb\relax{% - \MT@scale@to@em +\def\MT@pr@split@val#1,#2\relax + {\def\@tempb{#1}% + \MT@ifempty\@tempb + \relax + {\MT@scale@to@em \lpcode\MT@font\MT@char=\MT@the@pr@code }% \def\@tempb{#2}% - \MT@ifempty\@tempb\relax{% - \MT@scale@to@em + \MT@ifempty\@tempb + \relax + {\MT@scale@to@em \rpcode\MT@font\MT@char=\MT@the@pr@code }% \MT@ifdefined@c@T\MT@pr@inh@name{% @@ -215,41 +219,33 @@ \fi \ifnum\MT@count=\z@ \MT@info@missing@char \fi } -\def\MT@set@pr@heirs#1{% - \lpcode\MT@font #1=\lpcode\MT@font\MT@char\relax - \rpcode\MT@font #1=\rpcode\MT@font\MT@char\relax -} -\def\MT@preset@pr{% - \expandafter\expandafter\expandafter\MT@preset@pr@ - \csname MT@pr@c@\MT@pr@c@name @preset\endcsname\@nil -} -\def\MT@preset@pr@#1,#2\@nil{% - \ifx\MT@pr@unit@\@empty - \MT@warn@preset@towidth{pr}% - \let\MT@preset@aux\MT@preset@aux@factor - \else - \def\MT@preset@aux{\MT@preset@aux@space2}% +\def\MT@set@pr@prefixes#1{\MT@set@pr@prefixes@#1} +\def\MT@set@pr@prefixes@#1#2#3#4% + {% + \edef\@tempa{\expandafter\ifx\@car#1\@nil U\@gobble#1\else\number\XeTeXglyphindex"#1" \fi}% + \edef\@tempb{\expandafter\ifx\@car#2\@nil U\@gobble#2\else\number\XeTeXglyphindex"#2" \fi}% + \@tempcnta=\z@ + \ifnum#3>\z@ + \@tempcnta=\numexpr + (\fontcharwd\MT@font\@tempb-\fontcharwd\MT@font\@tempa)% + *#3/\MT@dimen@six\relax \fi - \MT@ifempty{#1}{\let\@tempa\@empty}{\MT@preset@aux{#1}\@tempa}% - \MT@ifempty{#2}{\let\@tempb\@empty}{\MT@preset@aux{#2}\@tempb}% - \MT@set@all@pr\@tempa\@tempb -} -\def\MT@preset@aux@factor#1#2{% - \@tempcntb=#1\relax - \MT@scale@factor - \edef#2{\number\@tempcntb}% -} -\def\MT@preset@aux@space#1#2#3{% - \def\@tempb{#2}% - \MT@get@space@unit#1% - \MT@scale@to@em - \edef#3{\number\@tempcntb}% + \lpcode\MT@font #2=\numexpr\lpcode\MT@font#1+\@tempcnta\relax + \@tempcnta=\z@ + \ifnum#4>\z@ + \@tempcnta=\numexpr + (\fontcharwd\MT@font\@tempb-\fontcharwd\MT@font\@tempa)% + *#4/\MT@dimen@six\relax + \fi + \rpcode\MT@font #2=\numexpr\rpcode\MT@font#1+\@tempcnta\relax } -\def\MT@warn@preset@towidth#1{% - \MT@warning@nl{% - Cannot preset characters relative to their widths\MessageBreak - for \@nameuse{MT@abbr@#1} list `\@nameuse{MT@#1@c@name}'. Presetting them% - \MessageBreak relative to 1em instead}% +\def\MT@prot@addtoken@next#1{% + \edef\MT@temp{\MT@toks={\the\MT@toks\noexpand#1}}\MT@temp + \setbox\MT@tempbox\hbox{\the\MT@toks + \relax + \ifnum\lastnodetype=7 \aftergroup\@firstoftwo\else\aftergroup\@secondoftwo\fi}% + \MT@prot@get@nextchar + {\MT@prot@l{\the\MT@toks}}% } \DeclareRobustCommand\lsstyle{% \MT@error{Letterspacing currently doesn't work with xetex} @@ -343,6 +339,7 @@ \def\MT@inh@split#1=#2=#3\relax{% \def\@tempa{#1}% \ifx\@tempa\@empty \else + \expandafter\MT@has@inh@prefix\@tempa()\relax\@nil \MT@get@slot \ifx\MT@char\@empty\else \let\MT@val\MT@char @@ -351,13 +348,42 @@ \ifx\@tempa\@empty \else \MT@get@slot \ifx\MT@char\@empty\else - \MT@exp@cs\MT@xadd{MT@inh@\MT@listname @\MT@val @}{{\MT@char}}% + \ifx\MT@inh@prefix\@empty + \MT@exp@cs\MT@xadd{MT@inh@\MT@listname @\MT@val @}{{\MT@char}}% + \else + \MT@exp@cs\MT@xadd{MT@inh@\MT@listname @prefixes}% + {{{\MT@val}{\MT@char}\MT@inh@prefix@}}% + \fi \fi \fi }% \fi \fi } +\def\MT@has@inh@prefix#1(#2)#3#4\@nil{% + \let\MT@temp\relax + \ifx\relax#3% + \def\@tempa{#1#2}% + \let\MT@inh@prefix\@empty + \else + \MT@ifstreq{\MT@feat}{pr}{% + \MT@ifstreq{#2}{l}{\def\MT@inh@prefix@{{1000}{0}}\@firstoftwo}{% + \MT@ifstreq{#2}{r}{\def\MT@inh@prefix@{{0}{1000}}\@firstoftwo}{% + \MT@ifstreq{#2}{lr}{\def\MT@inh@prefix@{{500}{500}}\@firstoftwo}{% + \MT@warning@nl{`#2' is not a valid prefix in inheritance list% + \MessageBreak\MT@listname. Ignoring it}% + \@secondoftwo}}}% + {\def\@tempa{#3}% + \def\MT@inh@prefix{#2}% + \@gobble}% + {\@firstofone}% + }{\@firstofone}% + {\let\MT@char\m@ne + \let\MT@temp\@gobble + }% + \fi + \MT@temp +} \MT@def@bool@opt{DVIoutput}{% \csname if\@tempa\endcsname \MT@warning@nl{Ignoring `DVIoutput' option}% diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.cfg b/Master/texmf-dist/tex/latex/microtype/microtype.cfg index 6fc34021702..8a33d8f86e0 100644 --- a/Master/texmf-dist/tex/latex/microtype/microtype.cfg +++ b/Master/texmf-dist/tex/latex/microtype/microtype.cfg @@ -18,11 +18,12 @@ %% 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 has the LPPL maintenance status `maintained'. %% -%% This work consists of the files microtype.dtx and microtype.ins and the -%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, -%% microtype-xetex.def, microtype.lua and letterspace.sty. +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. %% %% ------------------------------------------------------------------------ %% This is the main configuration file for the `microtype' package. @@ -40,7 +41,7 @@ %% \ProvidesFile {microtype.cfg} - [2021/03/14 v2.8c + [2021/10/31 v3.0 microtype main configuration file (RS)] @@ -132,9 +133,8 @@ \DeclareMicrotypeAlias{mlmr}{cmr} % mlmodern \DeclareMicrotypeAlias{mlmsy}{cmsy} % " \DeclareMicrotypeAlias{mlmm} {cmm} % " -\DeclareMicrotypeAlias{New Computer Modern}{Latin Modern Roman} -\DeclareMicrotypeAlias{NewCM10-Book.otf} {Latin Modern Roman} -\DeclareMicrotypeAlias{NewCM10-Regular.otf}{Latin Modern Roman} +\DeclareMicrotypeAlias{NewCM10-Book.otf} {New Computer Modern} +\DeclareMicrotypeAlias{NewCM10-Regular.otf}{New Computer Modern} %% -- Palatino \DeclareMicrotypeAlias{pxr} {ppl} % pxfonts \DeclareMicrotypeAlias{qpl} {ppl} % TeX Gyre Pagella (formerly: qfonts/QuasiPalatino) @@ -184,6 +184,15 @@ \DeclareMicrotypeAlias{zeus}{eus} % " \DeclareMicrotypeAlias{zpeus} {zpeu} % Adobe Euro sans -> serif \DeclareMicrotypeAlias{eurosans}{zpeu} % Adobe Euro sans -> serif +\DeclareMicrotypeAlias{Lato} {TU-basic} +\DeclareMicrotypeAlias{Lato-Regular} {TU-basic} +\DeclareMicrotypeAlias{Fontin} {TU-basic} +\DeclareMicrotypeAlias{Fontin-Regular} {TU-basic} +\DeclareMicrotypeAlias{Bergamo Std} {TU-basic} +\DeclareMicrotypeAlias{FontAwesome} {TU-empty} % fontawesome +\DeclareMicrotypeAlias{fontawesomefree} {TU-empty} % fontawesome5 +\DeclareMicrotypeAlias{fontawesomepro} {TU-empty} +\DeclareMicrotypeAlias{fontawesomebrands}{TU-empty} %%% ----------------------------------------------------------------------- %%% INTERACTION WITH THE `babel' PACKAGE @@ -396,6 +405,29 @@ z = {\'z,\.z,\v z} } +\DeclareCharacterInheritance + { encoding = LGR, + } + { + A = {012}, + I = {219}, + O = J, + U = {013,223}, + W = {011}, + a = {014,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143, + 144,145,146,148,149,150,248}, + e = {224,225,226,227,232,233,234,235}, + h = {152,153,154,156,157,158,160,161,162,163,164,165,166,167,168,169,170, + 171,172,173,174,175,249}, + i = {200,201,202,203,208,209,210,211,216,217,218,240,241,242,243}, + o = {228,229,230,231,236,237,238,239}, + r = {251,252}, + u = {015,204,205,206,207,212,213,214,215,220,221,222,244,245,246,247}, + w = {176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192, + 193,194,196,197,198,250}, + . = {059} % ano teleia + } + %%% ----------------------------------------------------------------------- %%% TRACKING/LETTERSPACING diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.lua b/Master/texmf-dist/tex/latex/microtype/microtype.lua index fc5ace819f7..173f30da8bb 100644 --- a/Master/texmf-dist/tex/latex/microtype/microtype.lua +++ b/Master/texmf-dist/tex/latex/microtype/microtype.lua @@ -18,11 +18,12 @@ -- 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 has the LPPL maintenance status `maintained'. -- --- This work consists of the files microtype.dtx and microtype.ins and the --- derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, --- microtype-xetex.def, microtype.lua and letterspace.sty. +-- This work consists of the files microtype.dtx, microtype-utf.dtx and +-- microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +-- microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +-- and microtype-show.sty. -- -- ------------------------------------------------------------------------ -- This file contains auxiliary lua functions. @@ -34,8 +35,8 @@ microtype = microtype or {} local microtype = microtype microtype.module = { name = "microtype", - version = "2.8c", - date = "2021/03/14", + version = "3.0", + date = "2021/10/31", description = "microtype module.", author = "E. Roux, R. Schlicht and P. Gesang", copyright = "E. Roux, R. Schlicht and P. Gesang", @@ -101,7 +102,7 @@ local function do_font() local thefont = font.getfont(font.current()) if thefont then for i,v in next,thefont.characters do - if v.index == nil or v.index > 0 then + if v.index == nil or ( v.index > 0 and i < 1114112 ) then microtype.sprint([[\@tempcnta=]]..i..[[\relax\MT@dofont@function]]) end end @@ -109,6 +110,24 @@ local function do_font() end microtype.do_font = do_font +local function add_ls(k) + local f = tex.fontname(font.current()) + local spec,size = match(f,'^(.+)( at .+)$') + if not spec then spec = f end + local a,b,c = match(spec,'^([^:]+):?([^:]*):?(.*)$') + local ls = "kernfactor=" .. k/1000 .. ';' + microtype.sprint(a..':') + if (a == "name" or a == "file") then + microtype.sprint(b..':'..ls..c) + else + microtype.sprint(ls..b) + end + if size then + microtype.sprint(size) + end +end +microtype.add_ls = add_ls + microtype.ligs = microtype.ligs or { } local function noligatures(fontcs,liga) @@ -153,7 +172,9 @@ end if luaotfload and luaotfload.aux and luaotfload.aux.slot_of_name then local slot_of_name = luaotfload.aux.slot_of_name microtype.name_to_slot = function(name, unsafe) - return slot_of_name(font.current(), name, unsafe) + local n = math.tointeger(slot_of_name(font.current(), name, unsafe)) + if n and n > 1114111 then n = -1 end + return n end else -- we dig into internal structure (should be avoided) diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.sty b/Master/texmf-dist/tex/latex/microtype/microtype.sty index f40ef5ecd60..cc4756cc230 100644 --- a/Master/texmf-dist/tex/latex/microtype/microtype.sty +++ b/Master/texmf-dist/tex/latex/microtype/microtype.sty @@ -18,18 +18,19 @@ %% 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 has the LPPL maintenance status `maintained'. %% -%% This work consists of the files microtype.dtx and microtype.ins and the -%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, -%% microtype-xetex.def, microtype.lua and letterspace.sty. +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. %% %% ------------------------------------------------------------------------ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage {microtype} - [2021/03/14 v2.8c + [2021/10/31 v3.0 Micro-typographical refinements (RS)] \def\MT@MT @@ -93,9 +94,9 @@ \@onlypreamble\DeclareMicrotypeBabelHook \expandafter\let\csname ver@letterspace.sty\endcsname\@empty \def\MT@old@cmd#1#2{% - \newcommand*#1{\MT@warning{% + \newcommand*#1{\MT@error{% \string#1 is deprecated. Please use\MessageBreak - \string#2 instead}% + \string#2 instead}{As I said}% \let #1#2#2}} \MT@old@cmd\DeclareMicroTypeAlias\DeclareMicrotypeAlias \MT@old@cmd\DeclareMicroTypeSet \DeclareMicrotypeSet @@ -149,6 +150,7 @@ \fi \fi \RequirePackage{keyval}[1997/11/10] +^^X\RequirePackage{etoolbox} \newtoks\MT@toks \newif\ifMT@if@ \newif\ifMT@protrusion @@ -157,6 +159,7 @@ \newif\ifMT@selected \newif\ifMT@noligatures \newif\ifMT@draft +\newif\ifMT@disable \newif\ifMT@spacing \newif\ifMT@kerning \newif\ifMT@tracking @@ -431,7 +434,9 @@ \newif\ifMT@xunicode \MT@with@package@T{xunicode}\MT@xunicodetrue \@ifl@t@r\fmtversion{2020/10/01} - {\AddToHook{package/after/fontspec}{\MT@fontspectrue}}\relax + {\IfFormatAtLeastTF{2021/11/15} + {\AddToHook{package/fontspec/after}{\MT@fontspectrue}} + {\AddToHook{package/after/fontspec}{\MT@fontspectrue}}}\relax \let\MT@maybe@gobble@with@tikz\@firstofone \def\MT@tikz@setup{% \def\MT@maybe@gobble@with@tikz{% @@ -469,6 +474,8 @@ time will almost certainly lead to undesired results. Have your choice!}% \MT@with@package@T{xunicode}\MT@xunicodetrue \MT@with@package@T{fontspec}\MT@fontspectrue \MT@glet\MT@setupfont@hook\@empty + %\gdef\MT@setupfont@hook{\tracingnone + % \MT@info{Silently doing my `magic' (Mittelbach) for font\MessageBreak\MT@@font}}% \MT@if@false \MT@with@babel@and@T{spanish} \MT@if@true \MT@with@babel@and@T{galician}\MT@if@true @@ -535,7 +542,121 @@ time will almost certainly lead to undesired results. Have your choice!}% \MT@MT@pickupfont}% }% }% + \MT@with@package@T{unicode-math}{% + \MT@let@nc{__um_sub_or_super:n}\relax + }% +} +\newif\ifMT@patch@ok +\def\MT@patch@info#1{\MT@info{Applying patch `#1'}} +\def\MT@patch@warn#1{\MT@warning{Unable to apply patch `#1'}} +\def\MT@patch@undef#1{\MT@warning{Patch `#1' undefined. Cannot apply it}} +\let\MT@patches@def\@gobble +\def\MT@define@patch#1#2#3{% + \g@addto@macro\MT@patches@def{,#1}% + \MT@def@n{MT@patch@@#1}{#2}% + \MT@def@n{MT@patch@undo@@#1}{#3}% +} +\def\MT@append@patch#1#2{% + \MT@remember@patch{#1}% + \apptocmd#1{#2}\relax\MT@patch@okfalse +} +\def\MT@patch@patch#1#2#3{% + \MT@remember@patch{#1}% + \patchcmd#1{#2}{#3}\relax\MT@patch@okfalse +} +\def\MT@remember@patch#1{% + \MT@ifdefined@n@TF{MT@patch@saved@\string#1}\relax + {\MT@let@nc{MT@patch@saved@\string#1}#1% + \MT@exp@cs\g@addto@macro{MT@patch@undo@@\MT@patch@name}% + {\MT@let@cn#1{MT@patch@saved@\string#1}}}% +} +\let\MT@patches@applied\@gobble +\def\MT@apply@patch#1{% + \MT@patch@oktrue + \MT@ifdefined@n@TF{MT@patch@@#1} + {\MT@in@clist{#1}\MT@patches@applied + \ifMT@inlist@ + \MT@warning{Patch `#1' has already been applied,\MessageBreak + cannot reapply it}% + \else + \def\MT@patch@name{#1}% + \g@addto@macro\MT@patches@applied{,#1}% + \@nameuse{MT@patch@@#1}% + \@nameuse{MT@patch@\ifMT@patch@ok info\else warn\fi}{#1}% + \fi} + {\MT@patch@undef{#1}}% +} +\def\MT@undo@patch#1{% + \MT@in@clist{#1}\MT@patches@applied + \ifMT@inlist@ + \MT@rem@from@clist{#1}\MT@patches@applied + \@nameuse{MT@patch@undo@@#1}% + \else + \MT@warning{Patch `#1' hasn't been applied,\MessageBreak cannot revert it}% + \fi } +{\catcode`\#=12 +\MT@addto@setup{% + \@ifclassloaded{beamer} + {\MT@define@patch{item} + {\MT@append@patch\@item\leftprotrusion + \MT@patch@patch\@item{\everypar{}}{\everypar{\leftprotrusion}}% + \MT@append@patch\beamer@@callorigitem\leftprotrusion + \MT@patch@patch\beamer@callorigitem{\ignorespaces}{\ignorespaces\leftprotrusion}} + {}} + {\@ifclassloaded{simplecv} + {\MT@define@patch{item} + {\MT@append@patch\@item\leftprotrusion + \MT@append@patch\@topic@item\leftprotrusion + \MT@patch@patch\@item{\everypar{}}{\everypar{\leftprotrusion}}} + {}}% + {\MT@define@patch{item} + {\MT@append@patch\@item\leftprotrusion + \MT@patch@patch\@item{\everypar{}}{\everypar{\leftprotrusion}}} + {}}}% + \@ifclassloaded{memoir} + {\MT@define@patch{toc} + {\MT@append@patch\numberline\leftprotrusion + \MT@append@patch\booknumberline\leftprotrusion + \MT@append@patch\partnumberline\leftprotrusion + \MT@append@patch\chapternumberline\leftprotrusion + \MT@append@patch\cftbookafterpnum\noprotrusion + \MT@append@patch\cftpartafterpnum\noprotrusion + \MT@append@patch\cftchapterafterpnum\noprotrusion + \MT@append@patch\cftsectionafterpnum\noprotrusion + \MT@append@patch\cftsubsectionafterpnum\noprotrusion + \MT@append@patch\cftsubsubsectionafterpnum\noprotrusion + \MT@append@patch\cftparagraphafterpnum\noprotrusion + \MT@append@patch\cftsubparagraphafterpnum\noprotrusion + \MT@append@patch\cftfigureafterpnum\noprotrusion + \MT@append@patch\cfttableafterpnum\noprotrusion} + {}} + {\MT@define@patch{toc} + {\MT@append@patch\numberline\leftprotrusion} + {}}% + \@ifpackageloaded{amsmath} + {\MT@define@patch{eqnum} + {\MT@patch@patch\tagform@{(}{\leftprotrusion{(}}% + \MT@patch@patch\tagform@{)}{\rightprotrusion{)}}% + \MT@patch@patch\eqref{\tagform@}{\@nameuse{MT@patch@saved@\string\tagform@}}}% + {}} + {\MT@define@patch{eqnum} + {\MT@patch@patch\@eqnnum{(}{\leftprotrusion{(}}% + \MT@patch@patch\@eqnnum{)}{\rightprotrusion{)}}}% + {}}% + \@ifclassloaded{memoir} + {\MT@define@patch{footnote} + {\MT@patch@patch\@footnotetext{\ignorespaces}{\ignorespaces\leftprotrusion}% + \MT@patch@patch\@footnotetext{\foottextfont #1}{\foottextfont\leftprotrusion #1}} + {}} + {\@ifpackageloaded{scrbase} + {\MT@define@patch{footnote} + {\MT@patch@patch\scr@saved@footnotetext{\ignorespaces}{\ignorespaces\leftprotrusion}} + {}} + {\MT@define@patch{footnote} + {\MT@patch@patch\@footnotetext{\ignorespaces}{\ignorespaces\leftprotrusion}} + {}}}% +}} \expandafter\ifx\the\font\nullfont\normalfont\fi \def\MT@split@name#1/#2/#3/#4/#5/#6\@nil{% \def\MT@encoding{#1}% @@ -646,6 +767,7 @@ time will almost certainly lead to undesired results. Have your choice!}% }% } \newif\ifMT@nofamily +\def\MT@protrusion{\MT@maybe@do{pr}} \def\MT@get@font@dimen#1{% \ifnum\fontdimen#1\MT@font=\z@ \MT@warning@nl{Font `\MT@@font' does not specify its\MessageBreak @@ -786,6 +908,208 @@ time will almost certainly lead to undesired results. Have your choice!}% \MT@cfg@catcodes \inputencoding{\@nameuse{\@tempa}}% } +\def\MT@set@pr@heirs#1{% + \lpcode\MT@font #1=\lpcode\MT@font\MT@char\relax + \rpcode\MT@font #1=\rpcode\MT@font\MT@char\relax +} +\def\MT@set@pr@prefixheirs{% + \MT@ifdefined@c@T\MT@pr@inh@name{% + \MT@ifdefined@n@T{MT@inh@\MT@pr@inh@name @prefixes}{% + \MT@exp@cs\MT@map@tlist@c + {MT@inh@\MT@pr@inh@name @prefixes}% + \MT@set@pr@prefixes + }% + }% +} +\def\MT@preset@pr{% + \expandafter\expandafter\expandafter\MT@preset@pr@ + \csname MT@pr@c@\MT@pr@c@name @preset\endcsname\@nil +} +\def\MT@preset@pr@#1,#2\@nil{% + \ifx\MT@pr@unit@\@empty + \MT@warn@preset@towidth{pr}% + \let\MT@preset@aux\MT@preset@aux@factor + \else + \def\MT@preset@aux{\MT@preset@aux@space2}% + \fi + \MT@ifempty{#1}{\let\@tempa\@empty}{\MT@preset@aux{#1}\@tempa}% + \MT@ifempty{#2}{\let\@tempb\@empty}{\MT@preset@aux{#2}\@tempb}% + \MT@set@all@pr\@tempa\@tempb +} +\def\MT@preset@aux@factor#1#2{% + \@tempcntb=#1\relax + \MT@scale@factor + \edef#2{\number\@tempcntb}% +} +\def\MT@preset@aux@space#1#2#3{% + \def\@tempb{#2}% + \MT@get@space@unit#1% + \MT@scale@to@em + \edef#3{\number\@tempcntb}% +} +\def\MT@warn@preset@towidth#1{% + \MT@warning@nl{% + Cannot preset characters relative to their widths\MessageBreak + for \@nameuse{MT@abbr@#1} list `\@nameuse{MT@#1@c@name}'. + Presetting them\MessageBreak relative to 1em instead}% +} +\MT@ifdefined@c@TF\noprotrusion\relax{ + \DeclareRobustCommand\noprotrusion{\leavevmode\kern-\p@\kern\p@} +} +\newbox\MT@tempbox +\newdimen\MT@leftmarginkern +\newdimen\MT@rightmarginkern +\DeclareRobustCommand\leftprotrusion{% + \MT@toks{}% + \MT@prot@get@firstchar +} +\long\def\MT@prot@l#1{% + \MT@get@prot{#1}% + \ifdim\MT@leftmarginkern=\z@ \else + \leavevmode + \MT@vinfo{|<< adding left margin kern for `\@tempa':\MessageBreak + \the\MT@leftmarginkern \on@line}% + \kern\MT@leftmarginkern + \fi + #1% +} +\DeclareRobustCommand\rightprotrusion{\MT@prot@r} +\long\def\MT@prot@r#1{% + #1% + \MT@get@prot{#1}% + \ifdim\MT@rightmarginkern=\z@ \else + \MT@vinfo{>>| adding right margin kern for `\@tempa':\MessageBreak + \the\MT@rightmarginkern \on@line}% + \kern\MT@rightmarginkern + \fi +} +\long\def\MT@get@prot#1{% + \MT@leftmarginkern=\z@ + \MT@rightmarginkern=\z@ + \begingroup + \setbox\MT@tempbox\vbox{% + \everypar{}% + \parfillskip=\z@skip + \hbadness\@M + \@newlistfalse + \noindent #1}% + \vbadness=\@M + \splittopskip=\z@ + \setbox\MT@tempbox\vbox{% + \global\setbox\MT@tempbox=\vsplit\MT@tempbox to \normalbaselineskip + \unvbox\MT@tempbox + \global\setbox\MT@tempbox=\lastbox + }% + \endgroup + \ifhbox\MT@tempbox + \def\@tempa{#1}% + \MT@leftmarginkern=\leftmarginkern\MT@tempbox\relax + \MT@rightmarginkern=\rightmarginkern\MT@tempbox\relax + \fi +} +\def\MT@prot@ifx#1{% + \ifx\MT@prot@next#1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi +} +\def\MT@prot@ifcat#1{% + \ifcat#1\noexpand\MT@prot@next\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi +} +^^X\def\MT@prot@ifmacro{% +^^X \expandafter\MT@prot@ifmacro@\meaning\MT@prot@next\@nil +^^X} +^^X\edef\MT@prot@ifmacro@#1\@nil{% +^^X \noexpand\MT@prot@ifmacro@@#1{}{}\detokenize{macro:->}\noexpand\@nil +^^X} +^^X\edef\MT@temp{% +^^X \def\noexpand\MT@prot@ifmacro@@##1\detokenize{macro:->}##2\noexpand\@nil{% +^^X \noexpand\ifx\relax##1\relax +^^X \unexpanded{\expandafter\@firstofone\else\expandafter\@gobble\fi}% +^^X }% +^^X} +^^X\MT@temp +^^Q\let\MT@prot@ifmacro\@gobble +\def\MT@prot@iffirstcmd#1{% + \ifx\relax#1\relax\expandafter\@secondoftwo\else + \MT@exp@two@c\ifx\@car\MT@prot@next\relax\@empty\@nil#1% + \expandafter\expandafter\expandafter\@firstoftwo + \else + \expandafter\expandafter\expandafter\@secondoftwo + \fi + \fi +} +\def\MT@getthird#1#2#3#4\@nil{#3} +\def\MT@prot@iflicrcmd#1{% + \MT@exp@cs\MT@prot@iffirstcmd{#1-cmd}{% + \expandafter\expandafter\expandafter\let + \expandafter\expandafter\expandafter\@tempa + \expandafter\MT@getthird\MT@prot@next\relax\@nil + \MT@exp@two@c\ifx\@car\@tempa\relax\@nil\@text@composite + \def\MT@temp*##1##2{\MT@prot@l{##1##2}}% + \else + \def\MT@temp*##1{\MT@prot@l{##1}}% + \fi + \@gobble + }\@firstofone +} +\def\MT@prot@get@firstchar{\futurelet\MT@prot@next\MT@prot@get@first@char} +\def\MT@prot@get@nextchar{\futurelet\MT@prot@next\MT@prot@get@next@char} +\def\MT@prot@get@first@char{% + \def\MT@temp*##1{\MT@prot@get@firstchar}% + \MT@prot@ifcat\bgroup{% + \long\def\MT@temp*##1{{\MT@prot@l{##1}}}% + }{% + \MT@prot@ifx\ignorespaces\relax{% + \MT@prot@ifx\relax\relax{% + \MT@prot@ifx\@sptoken{% + \def\MT@temp* {\MT@prot@get@firstchar}% + }{% + \def\MT@temp*{\MT@prot@addtoken@first}% + \MT@prot@ifcat{a}\relax{% + \MT@prot@ifcat{!}\relax{% + \def\MT@temp*{}% + \MT@prot@ifmacro{% + \MT@prot@iffirstcmd\UTFviii@two@octets{% + \def\MT@temp*##1##2{\MT@prot@l{##1##2}}% + }{% + \MT@prot@iffirstcmd\UTFviii@three@octets{% + \def\MT@temp*##1##2##3{\MT@prot@l{##1##2##3}}% + }{% + \MT@prot@iffirstcmd\UTFviii@four@octets{% + \def\MT@temp*##1##2##3##4{\MT@prot@l{##1##2##3##4}}% + }{% + \MT@prot@iflicrcmd{T1}{% + \MT@prot@iflicrcmd{TU}{% + \MT@prot@iflicrcmd{LY1}{% + \MT@prot@iflicrcmd{OT1}{% + \MT@prot@iflicrcmd{T2A}\relax % should we add more encodings? + }% + }% + }% + }% + }% + }% + }% + }% + }% + }% + }% + }% + }% + }% + \MT@temp*% +} +\def\MT@prot@get@next@char{% + \def\MT@temp*{\MT@prot@addtoken@next}% + \MT@prot@ifcat{a}\relax{% + \MT@prot@ifcat{!}\relax{% + \def\MT@temp*{\MT@prot@l{\the\MT@toks}}% + }% + }% + \MT@temp*% +} +\def\MT@prot@addtoken@first#1{% + \edef\MT@temp{\MT@toks={\the\MT@toks\noexpand#1}}\MT@temp + \MT@prot@get@nextchar +} \newif\ifMT@nonselected \DeclareRobustCommand\textls{% \@ifstar{\let\MT@ls@adjust@\MT@ls@adjust@empty\MT@textls}% @@ -815,29 +1139,31 @@ time will almost certainly lead to undesired results. Have your choice!}% \def\MT@ls@too@large#1{% \ifnum#1>\MT@tr@max \MT@warning{Maximum for option `letterspace' is \number\MT@tr@max}% - \let#1\MT@tr@max + \edef#1{\number\MT@tr@max}% \else \ifnum#1<\MT@tr@min \MT@warning{Minimum for option `letterspace' is \number\MT@tr@min}% - \let#1\MT@tr@min + \edef#1{\number\MT@tr@min}% \fi \fi } \newdimen\MT@outer@kern -\def\MT@load@list#1{% - \edef\@tempa{#1}% +\def\MT@load@list#1% + {\edef\@tempa{#1}% \MT@let@cn\@tempb{MT@\MT@feat @c@\@tempa @load}% \MT@ifstreq\@tempa\@tempb{% \MT@error{\@nameuse{MT@abbr@\MT@feat} list `\@tempa' cannot load itself}{}% }{% - \ifx\@tempb\relax \else + \ifx\@tempb\relax + \else \MT@ifdefined@n@TF{MT@\MT@feat @c@\@tempb}{% \MT@vinfo{... : First loading \@nameuse{MT@abbr@\MT@feat} list `\@tempb'}% \begingroup \MT@load@list\@tempb \endgroup - \edef\MT@curr@list@name{\@nameuse{MT@abbr@\MT@feat} list - \noexpand\MessageBreak`\@tempb'}% + \edef\MT@curr@list@name{% + \@nameuse{MT@abbr@\MT@feat} list \noexpand\MessageBreak + `\@tempb'}% \MT@let@cn\@tempc{MT@\MT@feat @c@\@tempb}% \expandafter\MT@set@codes\@tempc,\relax,% }{% @@ -1107,12 +1433,12 @@ time will almost certainly lead to undesired results. Have your choice!}% \fi } \def\MT@is@opt@char#1\iffontchar#2\char#3\else#4\fi\relax{% - \ifx\\#1\\% + \MT@ifempty{#1}{% \iffontchar#2% \expandafter\chardef \csname\MT@encoding\MT@detokenize@c\@tempa\endcsname=#3\relax \fi - \fi + }\relax } \begingroup \catcode`\/=\z@ @@ -1227,7 +1553,7 @@ time will almost certainly lead to undesired results. Have your choice!}% \MT@warning@nl{One or more slots in the configuration are unknown.\MessageBreak Make sure that no text commands are used.\MessageBreak See the documentation for details (the note\MessageBreak - on `#1' in section 9: `Hints and caveats')}% + on `#1' in section 11: `Hints and caveats')}% \MT@glet\MT@warn@unknown\relax}% } \let\MT@font@list\@empty @@ -1426,16 +1752,16 @@ time will almost certainly lead to undesired results. Have your choice!}% } \newcommand\MT@DeclareSet[3][]{% \MT@ifempty{#1}{% - \MT@map@clist@c\MT@features{{\MT@declare@sets{##1}{#2}{#3}}}% + \MT@map@clist@c\MT@features{\begingroup\MT@declare@sets{##1}{#2}{#3}\endgroup}% }{% - \MT@map@clist@n{#1}{{% + \MT@map@clist@n{#1}{\begingroup \MT@ifempty{##1}\relax{% \MT@is@feature{##1}{set declaration `#2'}{% \MT@exp@one@n\MT@declare@sets {\csname MT@rbba@##1\endcsname}{#2}{#3}% }% }% - }}% + \endgroup}% }% \MT@end@catcodes } @@ -1645,16 +1971,16 @@ time will almost certainly lead to undesired results. Have your choice!}% } \newcommand*\MT@UseMicrotypeSet[2][]{% \MT@ifempty{#1}{% - \MT@map@clist@c\MT@features{{\MT@use@set{##1}{#2}}}% + \MT@map@clist@c\MT@features{\begingroup\MT@use@set{##1}{#2}\endgroup}% }{% - \MT@map@clist@n{#1}{{% + \MT@map@clist@n{#1}{\begingroup \MT@ifempty{##1}\relax{% \MT@is@feature{##1}{activation of set `#2'}{% \MT@exp@one@n\MT@use@set {\csname MT@rbba@##1\endcsname}{#2}% }% }% - }}% + \endgroup}% }% \MT@end@catcodes } @@ -1676,16 +2002,16 @@ time will almost certainly lead to undesired results. Have your choice!}% } \newcommand*\MT@DeclareMicrotypeSetDefault[2][]{% \MT@ifempty{#1}{% - \MT@map@clist@c\MT@features{{\MT@set@default@set{##1}{#2}}}% + \MT@map@clist@c\MT@features{\begingroup\MT@set@default@set{##1}{#2}\endgroup}% }{% - \MT@map@clist@n{#1}{{% + \MT@map@clist@n{#1}{\begingroup \MT@ifempty{##1}\relax{% \MT@is@feature{##1}{declaration of default set `#2'}{% \MT@exp@one@n\MT@set@default@set {\csname MT@rbba@##1\endcsname}{#2}% }% }% - }}% + \endgroup}% }% \MT@end@catcodes } @@ -1871,17 +2197,17 @@ time will almost certainly lead to undesired results. Have your choice!}% } \def\MT@set@inh@list#1#2{% \MT@ifempty\MT@inh@feat{% - \MT@map@clist@c\MT@features{{% + \MT@map@clist@c\MT@features{\begingroup \MT@ifstreq{##1}{tr}\relax{\MT@declare@char@inh{##1}{#1}{#2}}% - }}% + \endgroup}% }{% - \MT@map@clist@c\MT@inh@feat{{% + \MT@map@clist@c\MT@inh@feat{\begingroup \KV@@sp@def\@tempa{##1}% \MT@ifempty\@tempa\relax{% \edef\@tempa{\csname MT@rbba@\@tempa\endcsname}% \MT@ifstreq\@tempa{tr}\relax{% \MT@exp@one@n\MT@declare@char@inh{\@tempa}{#1}{#2}}}% - }}% + \endgroup}% }% \MT@end@catcodes } @@ -2159,12 +2485,16 @@ time will almost certainly lead to undesired results. Have your choice!}% }% \fi } -\MT@def@bool@opt{final}{% - \csname if\@tempa\endcsname - \MT@draftfalse - \else - \MT@drafttrue - \fi +\MT@def@bool@opt{final}{} +\define@key{MT}{disable}[true]{% + \def\@tempa{#1}% + \MT@ifstreq\@tempa{true}\MT@disabletrue{% + \MT@ifstreq\@tempa{ifdraft}{\ifMT@draft\MT@disabletrue\fi}{% + \MT@ifstreq\@tempa{false}\relax{% + \MT@optwarn@admissible{#1}{disable}% + }% + }% + }% } \define@key{MT}{verbose}[true]{% \let\MT@vinfo\MT@info@nl @@ -2210,6 +2540,40 @@ time will almost certainly lead to undesired results. Have your choice!}% character widths}}% }% } +\let\MT@patches@list\relax +\let\MT@nopatches@list\@empty +\define@key{MT}{patch}[all]{% + \def\@tempa{#1}% + \MT@ifstreq\@tempa{all} + \relax + {\MT@ifstreq\@tempa{none} + {\let\MT@patches@list\@empty} + {\def\MT@patches@list{#1}}}% +} +\define@key{MT}{nopatch}[all]{% + \def\@tempa{#1}% + \MT@ifstreq\@tempa{all} + {\let\MT@nopatches@list\relax} + {\MT@ifstreq\@tempa{none} + \relax + {\def\MT@nopatches@list{#1}}}% +} +\MT@addto@setup{% + \ifx\MT@patches@list\relax + \let\MT@patches@list\MT@patches@def + \fi + \ifx\MT@nopatches@list\@empty\else + \ifx\MT@nopatches@list\relax + \let\MT@nopatches@list\MT@patches@def + \fi + \MT@map@clist@c\MT@nopatches@list{% + \MT@rem@from@clist{#1}\MT@patches@list}% + \fi + \ifx\MT@patches@list\@empty\else +^^X \MT@map@clist@c\MT@patches@list{\MT@apply@patch{#1}}% +^^Q \MT@warning@nl{Patches require the etex extensions. Ignoring them}% + \fi +} \let\MT@endinput\relax \ifx\MT@engine\relax \MT@warning@nl{You don't seem to be using pdftex, luatex or xetex.\MessageBreak @@ -2256,21 +2620,45 @@ time will almost certainly lead to undesired results. Have your choice!}% }% }% } -\MT@ifdefined@c@T\MicroType@Hook{\MT@warning{% +\MT@ifdefined@c@T\MicroType@Hook{\MT@error{% Command \string\MicroType@Hook\space is deprecated.\MessageBreak - Use \string\Microtype@Hook\space instead}\MicroType@Hook} + Use \string\Microtype@Hook\space instead} + {You might want to inform the font package authors.}\MicroType@Hook} \MT@ifdefined@c@T\Microtype@Hook\Microtype@Hook \def\microtypesetup{\setkeys{MT}} \MT@addto@setup{\def\microtypesetup#1{\setkeys{MTX}{#1}\selectfont}} \let\MT@saved@setupfont\MT@setupfont -\define@key{MTX}{disable}[]{% - \MT@info{Inactivate `\MT@MT' package}% +\define@key{MTX}{deactivate}[]{% + \MT@info{Deactivate `\MT@MT' package}% \let\MT@setupfont\relax } -\define@key{MTX}{enable}[]{% +\define@key{MTX}{reactivate}[]{% \MT@info{Reactivate `\MT@MT' package}% \let\MT@setupfont\MT@saved@setupfont } +\define@key{MTX}{patch}[all]{% + \def\@tempa{#1}% + \MT@ifstreq\@tempa{all} + \relax + {\MT@ifstreq\@tempa{none} + {\let\@tempa\@empty} + \relax}% + \ifx\@tempa\@empty\else +^^X \MT@map@clist@c\@tempa{\MT@apply@patch{##1}}% +^^Q \MT@warning@nl{Patches require the etex extensions. Ignoring them}% + \fi +} +\define@key{MTX}{nopatch}[all]{% + \def\@tempa{#1}% + \MT@ifstreq\@tempa{all} + \relax + {\MT@ifstreq\@tempa{none} + {\let\@tempa\@empty} + \relax}% + \ifx\@tempa\@empty\else +^^X \MT@map@clist@c\@tempa{\MT@undo@patch{##1}}% + \fi +} \def\MT@ProcessOptionsWithKV#1{% \let\@tempc\relax \let\MT@temp\@empty @@ -2290,8 +2678,8 @@ time will almost certainly lead to undesired results. Have your choice!}% \def\MT@getkey#1=#2\@nil{#1} \MT@ProcessOptionsWithKV{MT} \MT@addto@setup{% -\ifMT@draft - \MT@warning@nl{`draft' option active.\MessageBreak +\ifMT@disable + \MT@warning@nl{The `disable' option is in effect.\MessageBreak Disabling all micro-typographic extensions.\MessageBreak This might lead to different line and page breaks}% \let\MT@setupfont\relax diff --git a/Master/texmf-dist/tex/latex/microtype/mt-CharisSIL.cfg b/Master/texmf-dist/tex/latex/microtype/mt-CharisSIL.cfg index 9133b6b8ab6..6b09902a955 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-CharisSIL.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-CharisSIL.cfg @@ -18,11 +18,12 @@ %% 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 has the LPPL maintenance status `maintained'. %% -%% This work consists of the files microtype.dtx and microtype.ins and the -%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, -%% microtype-xetex.def, microtype.lua and letterspace.sty. +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. @@ -164,9 +165,8 @@ ү = {ұ}, Г = {Γ}, % Greek П = {Π}, % Greek - } - % missing: tipa, math, symbols, ... + } %%% ----------------------------------------------------------------------- %%% PROTRUSION @@ -485,7 +485,6 @@ family = Charis SIL, shape = {sc} } { - % ᴀ = {100,100}, % etc., doesn't work with \textsc /a.\MT@CHARIS@SC = {100,100}, /c.\MT@CHARIS@SC = {50, }, /d.\MT@CHARIS@SC = { ,50}, diff --git a/Master/texmf-dist/tex/latex/microtype/mt-EBGaramond.cfg b/Master/texmf-dist/tex/latex/microtype/mt-EBGaramond.cfg index 9ed6839e72a..9d10c596f16 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-EBGaramond.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-EBGaramond.cfg @@ -5,6 +5,7 @@ %% The original source files were: %% %% microtype.dtx (with options: `config,cfg-t,ebg') +%% microtype-utf.dtx (with options: `EBGaramond') %% %% ------------------------------------------------------------------------ %% @@ -18,11 +19,12 @@ %% 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 has the LPPL maintenance status `maintained'. %% -%% This work consists of the files microtype.dtx and microtype.ins and the -%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, -%% microtype-xetex.def, microtype.lua and letterspace.sty. +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. @@ -38,15 +40,47 @@ %% ------------------------------------------------------------------------ %% \ProvidesFile - {mt-EBGaramond.cfg}[2021/02/22 v1.6 microtype config. file: EB Garamond / Adobe Garamond (RS)] + {mt-EBGaramond.cfg}[2021/10/25 v2.0 microtype config. file: EB Garamond / Adobe Garamond (RS)] + +%%% ----------------------------------------------------------------------- +%%% CHARACTER INHERITANCE + +\DeclareCharacterInheritance + { encoding = LGR, + family = {EBGaramond-OsF,EBGaramond-TOsF,EBGaramond-LF,EBGaramond-TLF} + } + { + A = {009,012,253}, + (l)E = {199}, + H = {010}, + (l)H = {159}, + I = {219}, + (l)I = {155}, + O = J, + (l)O = {151}, + U = {013,223}, + W = {011}, + a = {014,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143, + 144,145,146,148,149,150,248}, + e = {224,225,226,227,232,233,234,235}, + h = {152,153,154,156,157,158,160,161,162,163,164,165,166,167,168,169,170, + 171,172,173,174,175,249}, + i = {008,200,201,202,203,208,209,210,211,216,217,218,240,241,242,243}, + o = {228,229,230,231,236,237,238,239}, + r = {251,252}, + u = {015,204,205,206,207,212,213,214,215,220,221,222,244,245,246,247}, + w = {176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192, + 193,194,196,197,198,250}, + \textstigma = \textvarstigma, + . = {059} % ano teleia + } %%% ----------------------------------------------------------------------- %%% PROTRUSION \SetProtrusion [ name = EBGaramond-default ] - { encoding = OT1, - family = {EBGaramond-LF,EBGaramond-OsF,EBGaramond-TLF,EBGaramond-TOsF} } + { } { A = {50,50}, \AE = {50, }, @@ -60,13 +94,14 @@ O = {50,50}, \OE = {50, }, Q = {50,70}, - T = {50,50}, + R = { ,70}, + T = {70,70}, V = {50,50}, W = {50,50}, X = {50,50}, Y = {50,50}, k = { ,50}, - p = {50,50}, + p = { ,50}, q = {50, }, r = { ,50}, t = { ,70}, @@ -74,17 +109,9 @@ w = {50,50}, x = {50,50}, y = { ,50}, - 1 = {150,150}, - 2 = {50,50}, - 3 = {50,50}, - 4 = {50,50}, - 5 = {50,50}, - 6 = {50,50}, - 7 = {50,80}, - 9 = {50,50}, - . = { ,700}, + . = { ,600}, {,}= { ,500}, - : = { ,500}, + : = { ,400}, ; = { ,300}, ! = { ,100}, ? = { ,100}, @@ -93,36 +120,173 @@ & = {50,100}, \% = {50,50}, * = {300,300}, - + = {300,300}, + + = {250,250}, ( = {100, }, ) = { ,200}, / = {100,200}, - = {300,500}, \textendash = {300,300}, \textemdash = {200,200}, - \textquoteleft = {500,700}, \textquoteright = {500,700}, - \textquotedblleft = {300,400}, \textquotedblright = {300,400} + \textquoteleft = {300,500}, \textquoteright = {400,400}, + \textquotedblleft = {300,300}, \textquotedblright = {300,300} + } + +\SetProtrusion + [ name = EBGaramond-OT1, + load = EBGaramond-default ] + { } + { + "00 = { ,150}, % \Gamma + "01 = {100,100}, % \Delta + "02 = { 50, 50}, % \Theta + "03 = {100,100}, % \Lambda + "04 = { 50, 50}, % \Xi + "07 = {100,100}, % \Upsilon + "08 = { 50, 50}, % \Phi + "09 = { 50, 50}, % \Psi + "0A = { 50, 50}, % \Omega + 138 = { , 50}, % \L + } + +\SetProtrusion + [ name = EBGaramond-OT1-LF, + load = EBGaramond-OT1 ] + { encoding = OT1, + family = {EBGaramond-LF,EBGaramond-TLF,EBGaramond-OsF} } + { + 1 = {50,50}, + 2 = {50,50}, + 4 = {50,50}, + 7 = {50,50}, + } + +\SetProtrusion + [ name = EBGaramond-OT1-TOsF, + load = EBGaramond-OT1 ] + { encoding = OT1, + family = {EBGaramond-TOsF} } + { + 1 = {150,150}, + 2 = {50,50}, + 3 = {50,50}, + 4 = {50,50}, + 5 = {50,50}, + 6 = {50,50}, + 7 = {50,80}, + 8 = {50,50}, + 9 = {50,50}, } \SetProtrusion [ name = EBGaramond-T1, load = EBGaramond-default ] - { encoding = {T1,LY1}, + { encoding = {LY1}, family = {EBGaramond-LF,EBGaramond-TLF,EBGaramond-OsF,EBGaramond-TOsF} } { _ = {100,100}, \textbackslash = {100,200}, \quotesinglbase = {400,400}, \quotedblbase = {400,400}, \guilsinglleft = {400,400}, \guilsinglright = {300,500}, - \guillemotleft = {300,300}, \guillemotright = {200,400}, + \guillemotleft = {300,300}, \guillemotright = {200,300}, \textexclamdown = {100, }, \textquestiondown = {100, }, \textbraceleft = {400,200}, \textbraceright = {200,400}, \textless = {200,100}, \textgreater = {100,200} } \SetProtrusion + [ name = EBGaramond-T1-LF, + load = EBGaramond-T1 ] + { encoding = T1, + family = {EBGaramond-LF,EBGaramond-TLF,EBGaramond-OsF} } + { + 1 = {50,50}, + 2 = {50,50}, + 4 = {50,50}, + 7 = {50,50}, + } + +\SetProtrusion + [ name = EBGaramond-T1-TOsF, + load = EBGaramond-T1 ] + { encoding = T1, + family = {EBGaramond-TOsF} } + { + 1 = {150,150}, + 2 = {50,50}, + 3 = {50,50}, + 4 = {50,50}, + 5 = {50,50}, + 6 = {50,50}, + 7 = {50,80}, + 8 = {50,50}, + 9 = {50,50}, + } + +\SetProtrusion + [ name = EBGaramond-LGR ] + { } + { + A = {50,50}, + D = {100,100}, + F = {50,50}, + G = { ,150}, + K = { ,50}, + L = {100,100}, + O = {50,50}, + U = {100,100}, + T = {50,50}, + W = { ,50}, + Y = {50,50}, + . = { ,600}, + {,}= { ,500}, + : = { ,400}, + ; = { ,300}, + ! = { ,100}, + ? = { ,100}, + ~ = {200,250}, + \% = {50,50}, + * = {300,300}, + + = {250,250}, + {=}= { 50, 50}, + ( = {100, }, ) = { ,200}, + / = {100,200}, + - = {300,500}, + \texteuro = { 50,100}, + \textendash = {300,300}, \textemdash = {200,200}, + \textquoteleft = {300,500}, \textquoteright = {400,400}, + \guillemotleft = {300,300}, \guillemotright = {200,400}, + } + +\SetProtrusion + [ name = EBGaramond-LGR-LF, + load = EBGaramond-LGR ] + { encoding = LGR, + family = {EBGaramond-LF,EBGaramond-TLF,EBGaramond-OsF} } + { + 1 = {50,50}, + 2 = {50,50}, + 4 = {50,50}, + 7 = {50,50}, + } + +\SetProtrusion + [ name = EBGaramond-LGR-TOsF, + load = EBGaramond-LGR ] + { encoding = LGR, + family = {EBGaramond-TOsF} } + { + 1 = {150,150}, + 2 = {50,50}, + 3 = {50,50}, + 4 = {50,50}, + 5 = {50,50}, + 6 = {50,50}, + 7 = {50,80}, + 8 = {50,50}, + 9 = {50,50}, + } + +\SetProtrusion [ name = EBGaramond-it ] - { encoding = OT1, - family = {EBGaramond-LF,EBGaramond-TLF,EBGaramond-OsF,EBGaramond-TOsF}, - shape = {it,sl} } + { } { A = {50, }, \AE = {50, }, @@ -172,11 +336,79 @@ } \SetProtrusion + [ name = EBGaramond-it-OT1, + load = EBGaramond-it ] + { } + { + "00 = { ,150}, % \Gamma + "01 = {100,100}, % \Delta + "02 = { 50, 50}, % \Theta + "03 = {100,100}, % \Lambda + "04 = { 50, 50}, % \Xi + "07 = {100,100}, % \Upsilon + "08 = { 50, 50}, % \Phi + "09 = { 50, 50}, % \Psi + "0A = { 50, 50}, % \Omega + 138 = { , 50}, % \L + } + +\SetProtrusion + [ name = EBGaramond-it-OT1-LF, + load = EBGaramond-it-OT1 ] + { encoding = OT1, + family = {EBGaramond-LF,EBGaramond-TLF}, + shape = it } + { + 1 = {50,50}, + 2 = {50,50}, + 3 = {80,50}, + 4 = {50,50}, + 5 = {50,50}, + 6 = {50,50}, + 7 = {50,50}, + 8 = {50,50}, + 9 = {50, }, + } + +\SetProtrusion + [ name = EBGaramond-it-OT1-OsF, + load = EBGaramond-it-OT1 ] + { encoding = OT1, + family = {EBGaramond-OsF}, + shape = it } + { + 1 = {50,50}, + 2 = {50,50}, + 3 = { ,80}, + 4 = {50,50}, + 7 = {50,50}, + } + +\SetProtrusion + [ name = EBGaramond-it-OT1-TOsF, + load = EBGaramond-it-OT1 ] + { encoding = OT1, + family = {EBGaramond-TOsF}, + shape = it } + { + 0 = {150,150}, + 1 = {150,150}, + 2 = {80,80}, + 3 = {50,80}, + 4 = {50,80}, + 5 = {50,80}, + 6 = {50,50}, + 7 = {50,100}, + 8 = {50,50}, + 9 = {50,80}, + } + +\SetProtrusion [ name = EBGaramond-it-T1, load = EBGaramond-it ] - { encoding = {T1,LY1}, + { encoding = {LY1}, family = {EBGaramond-LF,EBGaramond-TLF,EBGaramond-OsF,EBGaramond-TOsF}, - shape = {it,sl} } + shape = it } { _ = {100,100}, 156 = {50, }, % IJ @@ -190,10 +422,83 @@ } \SetProtrusion - [ name = EBGaramond-sc, - load = EBGaramond-default ] + [ name = EBGaramond-it-T1-LF, + load = EBGaramond-it-T1 ] + { encoding = T1, + family = {EBGaramond-LF,EBGaramond-TLF}, + shape = it } + { + 1 = {50,50}, + 2 = {50,50}, + 3 = {80,50}, + 4 = {50,50}, + 5 = {50,50}, + 6 = {50,50}, + 7 = {50,50}, + 8 = {50,50}, + 9 = {50, }, + } + +\SetProtrusion + [ name = EBGaramond-it-T1-OsF, + load = EBGaramond-it-T1 ] + { encoding = T1, + family = {EBGaramond-OsF}, + shape = it } + { + 1 = {50,50}, + 2 = {50,50}, + 3 = { ,80}, + 4 = {50,50}, + 7 = {50,50}, + } + +\SetProtrusion + [ name = EBGaramond-it-T1-TOsF, + load = EBGaramond-it-T1 ] + { encoding = T1, + family = {EBGaramond-TOsF}, + shape = it } + { + 0 = {150,150}, + 1 = {150,150}, + 2 = {80,80}, + 3 = {50,80}, + 4 = {50,80}, + 5 = {50,80}, + 6 = {50,50}, + 7 = {50,100}, + 8 = {50,50}, + 9 = {50,80}, + } + +\SetProtrusion + [ name = EBGaramond-sc-OT1-Prop, + load = EBGaramond-OT1-LF ] { encoding = OT1, - family = {EBGaramond-LF,EBGaramond-TLF,EBGaramond-OsF,EBGaramond-TOsF}, + family = {EBGaramond-LF,EBGaramond-OsF}, + shape = sc } + { + a = {50,50}, + \ae = {50, }, + d = { ,50}, + f = { ,50}, + g = {50, }, + j = {50, }, + l = { ,50}, + o = {50,50}, + \oe = {50, }, + q = {50,70}, + r = { , 0}, + t = {50,50}, + y = {50,50} + } + +\SetProtrusion + [ name = EBGaramond-sc-OT1-Tab, + load = EBGaramond-OT1-TOsF ] + { encoding = OT1, + family = {EBGaramond-TLF,EBGaramond-TOsF}, shape = sc } { a = {50,50}, @@ -203,7 +508,6 @@ g = {50, }, j = {50, }, l = { ,50}, - 013 = { ,50}, % fl o = {50,50}, \oe = {50, }, q = {50,70}, @@ -215,7 +519,7 @@ \SetProtrusion [ name = EBGaramond-sc-T1, load = EBGaramond-T1 ] - { encoding = {T1,LY1}, + { encoding = {LY1}, family = {EBGaramond-LF,EBGaramond-TLF,EBGaramond-OsF,EBGaramond-TOsF}, shape = sc } { @@ -226,7 +530,138 @@ g = {50, }, j = {50, }, l = { ,50}, - 029 = { ,50}, % fl + o = {50,50}, + \oe = {50, }, + q = {50,70}, + r = { , 0}, + t = {50,50}, + y = {50,50} + } + +\SetProtrusion + [ name = EBGaramond-sc-T1-Prop, + load = EBGaramond-T1-LF ] + { encoding = T1, + family = {EBGaramond-LF,EBGaramond-OsF}, + shape = sc } + { + a = {50,50}, + \ae = {50, }, + d = { ,50}, + f = { ,50}, + g = {50, }, + j = {50, }, + l = { ,50}, + o = {50,50}, + \oe = {50, }, + q = {50,70}, + r = { , 0}, + t = {50,50}, + y = {50,50} + } + +\SetProtrusion + [ name = EBGaramond-sc-T1-Tab, + load = EBGaramond-T1-TOsF ] + { encoding = T1, + family = {EBGaramond-TLF,EBGaramond-TOsF}, + shape = sc } + { + a = {50,50}, + \ae = {50, }, + d = { ,50}, + f = { ,50}, + g = {50, }, + j = {50, }, + l = { ,50}, + o = {50,50}, + \oe = {50, }, + q = {50,70}, + r = { , 0}, + t = {50,50}, + y = {50,50} + } + +\SetProtrusion + [ name = EBGaramond-scit-OT1-Prop, + load = EBGaramond-it-OT1-LF ] + { encoding = OT1, + family = {EBGaramond-LF,EBGaramond-OsF}, + shape = scit } + { + a = {50,50}, + \ae = {50, }, + d = { ,50}, + f = { ,50}, + g = {50, }, + j = {50, }, + l = { ,50}, + o = {50,50}, + \oe = {50, }, + q = {50,70}, + r = { , 0}, + t = {50,50}, + y = {50,50} + } + +\SetProtrusion + [ name = EBGaramond-scit-OT1-Tab, + load = EBGaramond-it-OT1-TOsF ] + { encoding = OT1, + family = {EBGaramond-TLF,EBGaramond-TOsF}, + shape = scit } + { + a = {50,50}, + \ae = {50, }, + d = { ,50}, + f = { ,50}, + g = {50, }, + j = {50, }, + l = { ,50}, + o = {50,50}, + \oe = {50, }, + q = {50,70}, + r = { , 0}, + t = {50,50}, + y = {50,50} + } + +\SetProtrusion + [ name = EBGaramond-scit-T1-Prop, + load = EBGaramond-it-T1-LF ] + { encoding = T1, + family = {EBGaramond-LF,EBGaramond-OsF}, + shape = scit } + { + a = {50,50}, + \ae = {50, }, + d = { ,50}, + f = { ,50}, + g = {50, }, + j = {50, }, + l = { ,50}, + o = {50,50}, + \oe = {50, }, + q = {50,70}, + r = { , 0}, + t = {50,50}, + y = {50,50} + } + +\SetProtrusion + [ name = EBGaramond-scit-T1-Tab, + load = EBGaramond-it-T1-TOsF ] + { encoding = T1, + family = {EBGaramond-TLF,EBGaramond-TOsF}, + shape = scit } + { + a = {50,50}, + \ae = {50, }, + d = { ,50}, + f = { ,50}, + g = {50, }, + j = {50, }, + l = { ,50}, o = {50,50}, \oe = {50, }, q = {50,70}, @@ -281,7 +716,7 @@ [ name = EBGaramond-textcomp-it ] { encoding = TS1, family = {EBGaramond-LF,EBGaramond-TLF,EBGaramond-OsF,EBGaramond-TOsF}, - shape = {it,sl} } + shape = it } { \textquotestraightbase = {400,400}, \textquotestraightdblbase = {300,400}, @@ -318,6 +753,478 @@ \textdiv = {200,200} } + +%%% ----------------------------------------------------------------------- +%%% INHERITANCE + +%% for xetex (EU1) and luatex (EU2), resp. both (TU) +\DeclareCharacterInheritance + { encoding = {TU,EU1,EU2}, + family = EBGaramond } + { + A = {À,Á,Â,Ã,Ä,Å,Ā,Ă,Ą,Ǎ,Ǟ,Ǡ,Ǻ,Ȁ,Ȃ,Ȧ,Ạ,Ả,Ấ,Ầ,Ẩ,Ẫ,Ậ,Ắ,Ằ,Ẳ,Ẵ,Ặ,Å,/Adieresis.deu, + А,Ӑ,Ӓ, % Cyrillic + Α,Ά,Ἀ,Ἁ,Ἂ,Ἃ,Ἄ,Ἅ,Ἆ,Ἇ,ᾈ,ᾉ,ᾊ,ᾋ,ᾌ,ᾍ,ᾎ,ᾏ,Ᾰ,Ᾱ,Ὰ,Ά,ᾼ}, % Greek + B = {Ḃ,Ḅ,Ḇ, + В, % Cyrillic + Β}, % Greek + C = {Ç,Ć,Ĉ,Ċ,Č,Ḉ, + Ϲ,С,Ҫ, % Cyrillic + Ⅽ}, % Roman numeral + D = {Ď,Đ,Ð,Ḋ,Ḍ,Ḏ,Ḑ,Ḓ, + Ɖ,Ɗ, % Cyrillic + Ⅾ}, % Roman numeral + E = {È,É,Ê,Ë,Ē,Ĕ,Ė,Ę,Ě,Ḕ,Ḗ,Ȩ,Ḙ,Ḛ,Ḝ,Ẹ,Ẻ,Ẽ,Ế,Ề,Ể,Ễ,Ệ,Ȅ,Ȇ, + Ѐ,Ё,Ӗ,Е, % Cyrillic + Ε}, % Greek + (l)Ε = {Έ,Ἐ,Ἑ,Ἒ,Ἓ,Ἔ,Ἕ,Ὲ,Έ}, % Greek (accents protruded) + F = {Ḟ}, + G = {Ĝ,Ğ,Ġ,Ģ,Ǥ,Ǧ,Ǵ,Ḡ}, + H = {Ĥ,Ħ,Ȟ,Ḣ,Ḥ,Ḧ,Ḩ,Ḫ,ῌ,Ⱨ, + Н,Ң,Ӊ,Ӈ, % Ҥ % Cyrillic + Η}, % Greek + (l)Η = {Ή,Ἠ,Ἡ,Ἢ,Ἣ,Ἤ,Ἥ,Ἦ,Ἧ,Ὴ,Ή,ᾘ,ᾙ,ᾚ,ᾛ,ᾜ,ᾝ,ᾞ,ᾟ}, + I = {Ì,Í,Î,Ï,Ĩ,Ī,Ĭ,Į,İ,Ǐ,Ȉ,Ȋ,Ḭ,Ḯ,Ỉ,Ị, + І,Ї,Ӏ, % Cyrillic + Ι, % Greek + Ⅰ,Ⅱ,Ⅲ}, % Roman numeral + (l)Ι = {Ί,Ϊ,Ἰ,Ἱ,Ἲ,Ἳ,Ἴ,Ἵ,Ἶ,Ἷ,Ῐ,Ῑ,Ὶ,Ί}, % Greek + J = {Ĵ, + Ј}, % Cyrillic + K = {Ķ,Ǩ,Ḱ,Ḳ,Ḵ,Ⱪ, + Κ,K}, % Greek + L = {Ĺ,Ļ,Ľ,Ŀ,Ł,Ḷ,Ḹ,Ḻ,Ḽ,Ⱡ,Ɫ, + Ⅼ}, % Roman numeral + M = {Ḿ,Ṁ,Ṃ, + М,Ӎ, % Cyrillic + Μ, % Greek + Ⅿ}, % Roman numeral + N = {Ñ,Ń,Ņ,Ň,Ŋ,Ǹ,Ṅ,Ṇ,Ṉ,Ṋ, + Ν}, % Greek + O = {Ò,Ó,Ô,Õ,Ö,Ø,Ō,Ŏ,Ő,Ǒ,Ǫ,Ǭ,Ǿ,Ȍ,Ȏ,Ȫ,Ȭ,Ȯ,Ȱ,Ṍ,Ṏ,Ṑ,Ṓ,Ọ,Ỏ,Ố,Ồ,Ổ,Ỗ,Ộ,Ớ,Ờ,Ở,Ỡ,Ợ,Ơ,/Odieresis.deu, + О,Ӧ,Ө,Ӫ, % Cyrillic + Ο,Ό,Ὀ,Ὁ,Ὂ,Ὃ,Ὄ,Ὅ,Ὸ,Ό}, % Greek + P = {Ṕ,Ṗ,Ᵽ, + Р,Ҏ, % Cyrillic + Ρ}, % Greek + (l)Ρ = {Ῥ}, % Greek + Q = {Ԛ}, % Cyrillic + R = {Ŕ,Ŗ,Ř,Ȑ,Ȓ,Ṙ,Ṛ,Ṝ,Ṟ,Ɽ,}, + S = {Ś,Ŝ,Ş,Š,Ș,Ṡ,Ṣ,Ṥ,Ṧ,Ṩ, + Ѕ}, % Cyrillic + T = {Ţ,Ť,Ŧ,Ț,Ṫ,Ṭ,Ṯ,Ṱ, + Т,Ҭ, % Cyrillic + Τ}, % Greek + U = {Ù,Ú,Û,Ü,Ũ,Ū,Ŭ,Ů,Ű,Ų,Ǔ,Ǖ,Ǘ,Ǚ,Ǜ,Ȕ,Ȗ,Ṳ,Ṵ,Ṷ,Ṹ,Ṻ,Ụ,Ủ,Ứ,Ừ,Ử,Ữ,Ự}, % /Udieresis.deu ? + V = {Ṽ,Ṿ,/U.LAT, + Ⅴ}, % Roman numeral + W = {Ŵ,Ẁ,Ẃ,Ẅ,Ẇ,Ẉ, + Ԝ}, % Cyrillic + X = {Ẋ,Ẍ, + Х,Ҳ,Ӽ,Ӿ, % Cyrillic + Χ, % Greek + Ⅹ}, % Roman numeral + Y = {Ý,Ŷ,Ÿ,Ȳ,Ẏ,Ỳ,Ỵ,Ỷ,Ỹ, + Ү,Ұ}, % Cyrillic + Z = {Ź,Ż,Ž,Ẑ,Ẓ,Ẕ,Ⱬ, + Ζ}, % Greek + a = {à,á,â,ã,ä,å,ā,ă,ą,ǎ,ǟ,ǡ,ǻ,ȁ,ȃ,ȧ,ḁ,ạ,ả,ấ,ầ,ẩ,ẫ,ậ,ắ,ằ,ẳ,ẵ,ặ,ẚ, + а,ӑ,ӓ}, % Cyrillic + b = {ḃ,ḅ,ḇ}, + c = {ç,ć,ĉ,ċ,č,ḉ, + с,ҫ, % Cyrillic + ⅽ}, % Roman numeral + d = {ď,đ,ḋ,ḍ,ḏ,ḑ,ḓ, + ⅾ}, % Roman numeral + e = {è,é,ê,ë,ē,ĕ,ė,ę,ě,ȩ,ḕ,ḗ,ḙ,ḛ,ḝ,ẹ,ẻ,ẽ,ế,ề,ể,ễ,ệ,ȅ,ȇ, + е,ѐ,ё,ӗ}, % Cyrillic + f = {ḟ,ff,/f.long,/f.DEU,/f_f}, + fl = {ffl,/longs_l,/longs_longs_l,/f_l}, + fi = {ffi,/longs_i,/longs_longs_i,/f_i}, + /f.short = {/f_f.short}, + g = {ĝ,ğ,ġ,ģ,ḡ,ǥ,ǧ,ǵ}, + h = {ĥ,ħ,ḣ,ḥ,ḧ,ḩ,ḫ,ẖ,ȟ,ⱨ, + ԧ,ԧ}, % Cyrillic + i = {ì,í,î,ï,ĩ,ī,ĭ,į,ı,ǐ,ȉ,ȋ,ḭ,ỉ,ị,ḯ,/i.TRK, + і,ї, % Cyrillic + ⅰ,ⅱ,ⅲ}, % Roman numeral + j = {ĵ,ǰ, + ј}, % Cyrillic + k = {ķ,ǩ,ḱ,ḳ,ḵ,ⱪ}, + l = {ĺ,ļ,ľ,ŀ,ł,ḷ,ḹ,ḻ,ḽ,ⱡ, + ӏ, % palochka + ⅼ}, % Roman numeral + m = {ḿ,ṁ,ṃ, + ⅿ}, % Roman numeral + n = {ñ,ń,ņ,ň,ŋ,ṅ,ṇ,ṉ,ṋ,ǹ}, % ʼn + o = {ò,ó,ô,õ,ö,ø,ō,ŏ,ő,ǒ,ǫ,ǭ,ǿ,ȍ,ȏ,ȫ,ȭ,ȯ,ȱ,ṍ,ṏ,ṑ,ṓ,ọ,ỏ,ố,ồ,ổ,ỗ,ộ,ớ,ờ,ở,ỡ,ợ, + о,ӧ}, % Cyrillic + p = {ṕ,ṗ, + р,ҏ}, % Cyrillic + q = {ԛ}, % Cyrillic + r = {ŕ,ŗ,ř,ȑ,ȓ,ṙ,ṛ,ṝ,ṟ}, + s = {ś,ŝ,ş,š,ș,ṡ,ṣ,ṥ,ṧ,ṩ, + ѕ}, % Cyrillic + t = {ţ,ť,ŧ,ț,ṫ,ṭ,ṯ,ṱ,ẗ}, + u = {ù,ú,û,ü,ũ,ū,ŭ,ů,ű,ų,ǔ,ǖ,ǘ,ǚ,ǜ,ȕ,ȗ,ṳ,ṵ,ṷ,ṹ,ṻ,ụ,ủ,ứ,ừ,ử,ữ,ự,/u.LATmedi}, + v = {ṽ,ṿ, + ⅴ}, % Roman numeral + w = {ŵ,ẁ,ẃ,ẅ,ẇ,ẉ,ẘ, + ԝ}, % Cyrillic + x = {ẋ,ẍ, + х,ҳ, % Cyrillic + ⅹ}, % Roman numeral + y = {ý,ÿ,ŷ,ȳ,ẏ,ẙ,ỳ,ỵ,ỷ,ỹ, + у,ӯ,ӱ,ӳ,ў}, % Cyrillic + z = {ź,ż,ž,ⱬ,ẑ,ẓ,ẕ}, + Æ = {Ǣ,Ǽ, + Ӕ}, % Cyrillic + æ = {ǣ,ǽ, + ӕ}, % Cyrillic + DZ = {DŽ}, + Dz = {Dž}, + dz = {dž}, + % Smallcaps + /a.sc = {/A.sc}, + /ae.sc = {/AE.sc}, + /d.sc = {/D.sc}, + /f.sc = {/F.sc}, + /g.sc = {/G.sc}, + /j.sc = {/J.sc}, + /l.sc = {/L.sc}, + /o.sc = {/O.sc}, + /oe.sc = {/OE.sc}, + /q.sc = {/Q.sc}, + /r.sc = {/R.sc}, + /t.sc = {/T.sc}, + /y.sc = {/Y.sc}, + % Cyrillic + Г = {Ґ,Ғ,Ѓ,Ӷ}, + Ж = {Җ,Ӝ,Ӂ,Ѫ}, + З = {Ҙ,Ӟ}, + И = {Й,Ҋ,Ӣ,Ӥ,Ѝ}, + К = {Қ,Ҝ,Ҟ,Ҡ,Ќ,Ӄ}, + Л = {Ӆ,Ԓ,Ԯ}, + П = {Ԥ}, + У = {Ӯ,Ӱ,Ӳ,Ў}, + Ц = {Ҵ,Џ}, + Ч = {Ҷ,Ҹ,Ӌ,Ӵ}, + Ш = {Щ}, + Ы = {Ӹ}, + Ь = {Ҍ}, + Э = {Ӭ}, + Ѵ = {Ѷ}, + Ҽ = {Ҿ}, + Ә = {Ӛ}, + г = {ѓ,ґ,ғ,ӷ}, + ж = {җ,ӂ,ӝ,ѫ}, + з = {ҙ,ӟ}, + и = {й,ѝ,ҋ,ӣ,ӥ}, + к = {ќ,қ,ҝ,ӄ}, % ҟ,ҡ + л = {ӆ,ԓ,ԯ}, + м = {ӎ}, + н = {ң,ӈ,ӊ,ԩ}, % ҥ + п = {ԥ}, + т = {ҭ}, + ц = {ҵ}, + ч = {ҷ,ҹ,ӌ,ӵ}, + ш = {щ}, + ы = {ӹ}, + э = {ӭ}, + ѳ = {ө,ӫ}, + ѵ = {ѷ}, + ү = {ұ}, + ҽ = {ҿ}, + ә = {ӛ}, + % Greek + Υ = {Ϋ,ϒ,ϔ,Ῠ,Ῡ}, + (l)Υ = {Ύ,ϓ,Ὑ,Ὓ,Ὕ,Ὗ,Ὺ,Ύ}, + (l)Ω = {Ώ,Ὠ,Ὡ,Ὢ,Ὣ,Ὤ,Ὥ,Ὦ,Ὧ,ᾨ,ᾩ,ᾪ,ᾫ,ᾬ,ᾭ,ᾮ,ᾯ,Ὼ,Ώ}, + Ω = {ῼ,Ω}, % math + Δ = {∆}, % math + Π = {∏}, % math + α = {ά,ἀ,ἁ,ἂ,ἃ,ἄ,ἅ,ἆ,ἇ,ὰ,ά,ᾀ,ᾁ,ᾂ,ᾃ,ᾄ,ᾅ,ᾆ,ᾇ,ᾰ,ᾱ,ᾲ,ᾳ,ᾴ,ᾶ,ᾷ}, + ε = {έ,ἐ,ἑ,ἒ,ἓ,ἔ,ἕ,ὲ,έ}, + η = {ή,ἠ,ἡ,ἢ,ἣ,ἤ,ἥ,ἦ,ἧ,ὴ,ή,ῂ,ῃ,ῄ,ῆ,ῇ,ᾐ,ᾑ,ᾒ,ᾓ,ᾔ,ᾕ,ᾖ,ᾗ}, + ι = {ί,ϊ,ἰ,ἱ,ἲ,ἳ,ἴ,ἵ,ἶ,ἷ,ὶ,ί,ῐ,ῑ,ῒ,ΐ,ῖ,ῗ,ΐ}, + ο = {ό,ϙ,ὀ,ὁ,ὂ,ὃ,ὄ,ὅ,ὸ,ό}, + ρ = {ῤ,ῥ}, + υ = {ΰ,ϋ,ύ,ὐ,ὑ,ὒ,ὓ,ὔ,ὕ,ὖ,ὗ,ὺ,ύ,ῠ,ῡ,ῢ,ΰ,ῦ,ῧ}, + ω = {ώ,ὠ,ὡ,ὢ,ὣ,ὤ,ὥ,ὦ,ὧ,ὼ,ώ,ᾠ,ᾡ,ᾢ,ᾣ,ᾤ,ᾥ,ᾦ,ᾧ,ῲ,ῳ,ῴ,ῶ,ῷ}, + % other + ⑴ = {⑵,⑶,⑷,⑸,⑹,⑺,⑻,⑼,⑽,⑾,⑿,⒀,⒁,⒂,⒃,⒄,⒅,⒆,⒇}, + ⒜ = {⒝,⒞,⒟,⒠,⒡,⒢,⒣,⒤,⒥,⒦,⒧,⒨,⒩,⒪,⒫,⒬,⒭,⒮,⒯,⒰,⒱,⒲,⒳,⒴,⒵}, + 🇦 = {🇧,🇨,🇩,🇪,🇫,🇬,🇭,🇮,🇯,🇰,🇱,🇲,🇳,🇴,🇵,🇶,🇷,🇸,🇹,🇺,🇻,🇼,🇽,🇾,🇿}, + ! = {‼}, + ? = {⁇}, + . = {/onedotenleader}, + /endash = {/figuredash}, + } + +%%% ----------------------------------------------------------------------- +%%% PROTRUSION + +\SetProtrusion + [ name = EBGaramond-TU, + load = EBGaramond-T1-LF ] + { encoding = {TU,EU1,EU2}, + family = EBGaramond } + { + /one.tosf = {150,150}, + /two.tosf = {50,50}, + /three.tosf = {50,50}, + /four.tosf = {50,50}, + /five.tosf = {50,50}, + /six.tosf = {50,50}, + /seven.tosf = {50,80}, + /eight.tosf = {50,50}, + /nine.tosf = {50,50}, + /one.lf = {50,50}, + /two.lf = {50,50}, + /four.lf = {50,50}, + /seven.lf = {50,50}, + /one.osf = {50,50}, + /two.osf = {50,50}, + /four.osf = {50,50}, + /seven.osf = {50,50}, + Ⅳ = { , 35}, + Ⅵ = { 35, }, + Ⅶ = { 30, }, + Ⅷ = { 25, }, + Ⅸ = { , 35}, + Ⅺ = { 35, }, + Ⅻ = { 30, }, + ⅳ = { , 25}, + ⅵ = { 25, }, + ⅶ = { 20, }, + ⅷ = { 20, }, + ⅸ = { , 25}, + ⅺ = { 25, }, + ⅻ = { 20, }, + % textcomp + \textquotesingle = {400,500}, + ˷ = {200,250}, + ƒ = { ,100}, + ₡ = { 50, }, + † = {100,100}, + ‡ = { 80, 80}, + • = { ,100}, + · = {300,400}, % periodcentered + /twodotenleader = {150,200}, + /ellipsis = {100,150}, + ℃ = { 80, }, + ° = {400,400}, + ™ = {100,100}, + © = {100,100}, + ® = {100,100}, + ª = {200,200}, + º = {200,200}, + ¹ = {200,200}, + ² = {200,200}, + ³ = {200,200}, + ¬ = {200, }, + ¶ = { ,100}, + − = {300,300}, % minus + ± = {150,200}, + × = {100,150}, + ÷ = {150,200}, + € = { 50,100}, + ¥ = { 50, 50}, + % Greek + Γ = { ,150}, + Δ = {100,100}, + Θ = { 50, 50}, + Λ = {100,100}, + Ξ = { 50, 50}, + Υ = {100,100}, + Φ = { 50, 50}, + Ψ = { 50, 50}, + Ω = { , 50}, + ζ = { , 50}, + λ = { 50, 50}, + γ = { 50, 50}, + π = { 50, 50}, + ρ = { , 50}, + σ = { 50, 50}, + τ = { 50, 50}, + χ = { 50, 50}, + φ = { 50, 50}, + ϙ = { 50, 50}, + ψ = { 50, 50}, + % Cyrillic + Г = { ,150}, + Д = { 50, 50}, + Ж = { 50, 50}, + К = { , 50}, + Л = { 50, }, + Љ = { 50, 50}, + З = { 50, 50}, + У = { 50,100}, + Ф = { 50, 50}, + Ч = { 70, }, + Я = { 50, }, + Ъ = { 50, 50}, + Ь = { , 50}, + ж = { 50, 50}, + ф = { 50, 50}, + ъ = { 50, 50}, + Ѱ = { 50, 50}, + г = { , 50}, + Ѵ = { 50, 50}, + % other + Þ = { , 50}, + þ = { , 50}, + Ʌ = {100,100}, + ⑴ = { 35, 65}, + ⒜ = { 30, 60}, + } + +\SetProtrusion + [ name = EBGaramond-it-TU, + load = EBGaramond-it-T1-LF ] + { encoding = {TU,EU1,EU2}, + family = EBGaramond, + shape = it } + { + /zero.tosf = {150,150}, + /one.tosf = {150,150}, + /two.tosf = {80,80}, + /three.tosf = {50,80}, + /four.tosf = {50,80}, + /five.tosf = {50,80}, + /six.tosf = {50,50}, + /seven.tosf = {50,100}, + /eight.tosf = {50,50}, + /nine.tosf = {50,80}, + /one.lf = {50,50}, + /two.lf = {50,50}, + /three.lf = {80,50}, + /four.lf = {50,50}, + /five.lf = {50,50}, + /six.lf = {50,50}, + /seven.lf = {50,50}, + /eight.lf = {50,50}, + /nine.lf = {50, }, + /one.osf = {50,50}, + /two.osf = {50,50}, + /three.osf = { ,80}, + /four.osf = {50,50}, + /seven.osf = {50,50}, + % textcomp + \textquotesingle = {800,100}, + − = {300,300}, % minus + ˷ = {200,250}, + † = {200,100}, + ‡ = { 80, 80}, + • = {300, }, + ℃ = {200, }, + ƒ = {100, }, + ₡ = {100, }, + ™ = {200, }, + © = {200,100}, + ® = {200,100}, + ¬ = {300, }, + ° = {500,100}, + ± = {200,150}, + ¹ = {300,100}, + ² = {300, }, + ³ = {300, }, + · = {300,500}, % periodcentered + /twodotenleader = {150,300}, + /ellipsis = {100,200}, + € = {100, }, + × = {200,100}, + ÷ = {200,200}, + ¶ = { ,100}, + ª = {200,200}, + º = {200,200}, + ¥ = { 50, 50}, + % Greek + Δ = {150, }, + Θ = { 50, }, + Λ = {150, }, + Υ = {100, 50}, + Φ = { 50, }, + Χ = { 50, }, + Ψ = {100, }, + Ω = { 50, }, + γ = { , 50}, + λ = { 50, }, + % Cyrillic + Ү = { 50, }, + Ч = {100, }, + З = {100, }, + % other + Þ = { 50, 50}, + þ = { , 50}, + } + +\SetProtrusion + [ name = EBGaramond-sc-TU, + load = EBGaramond-TU ] + { encoding = {TU,EU1,EU2}, + family = EBGaramond, + shape = sc } + { + a = {50,50}, + \ae = {50, }, + d = { ,50}, + f = { ,50}, + g = {50, }, + j = {50, }, + l = { ,50}, + o = {50,50}, + \oe = {50, }, + q = {50,70}, + r = { , 0}, + t = {50,50}, + y = {50,50}, + % Greek + α = {50,50}, + γ = { ,50}, + δ = {50,50}, + λ = {50,50}, + ο = {50,50}, + τ = {50,50}, + υ = {50,50}, + ψ = {50,50}, + % Cyrillic + т = {50,50}, + } + +\SetProtrusion + [ name = EBGaramond-scit-TU, + load = EBGaramond-it-TU ] + { encoding = {TU,EU1,EU2}, + family = EBGaramond, + shape = scit } + { + a = {50,50}, + \ae = {50, }, + d = { ,50}, + f = { ,50}, + g = {50, }, + j = {50, }, + l = { ,50}, + o = {50,50}, + \oe = {50, }, + q = {50,70}, + r = { , 0}, + t = {50,50}, + y = {50,50}, + % Greek + α = {50,50}, + γ = { ,50}, + δ = {50,50}, + λ = {50,50}, + ο = {50,50}, + τ = {50,50}, + υ = {50,50}, + ψ = {50,50}, + % Cyrillic + т = {50,50}, + } + \endinput %% %% End of file `mt-EBGaramond.cfg'. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-LatinModernRoman.cfg b/Master/texmf-dist/tex/latex/microtype/mt-LatinModernRoman.cfg index 13b96cbad08..f91bbb87fa9 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-LatinModernRoman.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-LatinModernRoman.cfg @@ -18,11 +18,12 @@ %% 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 has the LPPL maintenance status `maintained'. %% -%% This work consists of the files microtype.dtx and microtype.ins and the -%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, -%% microtype-xetex.def, microtype.lua and letterspace.sty. +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. @@ -47,8 +48,10 @@ \DeclareCharacterInheritance { encoding = {EU1,EU2,TU}, family = Latin Modern Roman } - { A = {À,Á,Â,Ã,Ä,Å,Ā,Ă,Ą,Ǻ,Ȁ,Ạ,Ả,Ấ,Ầ,Ẩ,Ẫ,Ậ,Ắ,Ằ,Ẳ,Ặ, - Α}, % Greek + { + A = {À,Á,Â,Ã,Ä,Å,Ā,Ă,Ą,Ǻ,Ȁ,Ạ,Ả,Ấ,Ầ,Ẩ,Ẫ,Ậ,Ắ,Ằ,Ẳ,Ặ, + Α % Greek + }, Æ = {Ǽ}, B = {฿, Β}, % Greek @@ -58,9 +61,11 @@ Ε}, % Greek G = {Ĝ,Ğ,Ġ,Ģ,Ǧ,Ǵ}, H = {Ĥ,Ħ,Ḥ,Ḧ,Ḫ, - Η}, % Greek + Η % Greek + }, I = {Ì,Í,Î,Ï,Ĩ,Ī,Ĭ,Į,İ,Ȉ,Ỉ,Ị, - Ι}, % Greek + Ι % Greek + }, J = {Ĵ}, K = {Ķ, Κ}, % Greek @@ -86,7 +91,7 @@ c = {ç,ć,ĉ,ċ,č}, d = {đ,ḍ,ḏ}, e = {è,é,ê,ë,ē,ĕ,ė,ę,ě,ȅ,ẹ,ẻ,ẽ,ế,ề,ể,ễ,ệ}, - f = {ff}, % Unicode 64256, glyph name in Latin Modern: /f_f ; in New Computer Modern: /ff + f = {ff}, % Unicode 64256, glyph name in Latin Modern Roman: /f_f ; in New Computer Modern: /ff g = {ĝ,ğ,ġ,ģ,ǧ,ǵ}, h = {ĥ,ħ,ḥ,ḧ,ḫ}, i = {ì,í,î,ï,ĩ,ī,ĭ,į,ı,ȉ,ỉ,ị}, @@ -94,7 +99,8 @@ k = {ķ}, l = {ĺ,ļ,ł,ḷ,ḹ}, % ľ,l· n = {ñ,ń,ņ,ň,ṅ,ṇ}, - o = {ò,ó,ô,õ,ö,ø,ō,ŏ,ő,ọ,ơ,ǫ,ǿ,ȍ,ỏ,ố,ồ,ổ,ỗ,ộ,ớ,ờ,ỡ,ở,ợ}, + o = {ò,ó,ô,õ,ö,ø,ō,ŏ,ő,ọ,ơ,ǫ,ǿ,ȍ,ỏ,ố,ồ,ổ,ỗ,ộ,ớ,ờ,ỡ,ở,ợ + }, r = {ŕ,ŗ,ř,ȑ,ṛ,ṙ,ṝ}, s = {ś,ŝ,ş,š,ș,ṣ}, t = {ţ,ț,ṭ,ṯ,ẗ}, % ť @@ -158,8 +164,8 @@ / = {200,300}, /backslash = {200,300}, ' = {300,400}, % /quotesingle - ‘ = {500,700}, ’ = {500,600}, - “ = {500,300}, ” = {200,600}, + ‘ = {300,400}, ’ = {300,400}, + “ = {300,300}, ” = {300,300}, ‚ = {400,400}, „ = {400,400}, ‹ = {400,400}, › = {300,500}, « = {300,200}, » = {100,400}, diff --git a/Master/texmf-dist/tex/latex/microtype/mt-NewComputerModern.cfg b/Master/texmf-dist/tex/latex/microtype/mt-NewComputerModern.cfg new file mode 100644 index 00000000000..d13e1cf7e90 --- /dev/null +++ b/Master/texmf-dist/tex/latex/microtype/mt-NewComputerModern.cfg @@ -0,0 +1,560 @@ +%% +%% This is file `mt-NewComputerModern.cfg', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% microtype-utf.dtx (with options: `NewComputerModern') +%% +%% ------------------------------------------------------------------------ +%% +%% The `microtype' package +%% Subliminal refinements towards typographical perfection +%% Copyright (c) 2004--2021 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 `maintained'. +%% +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. +%% +%% ------------------------------------------------------------------------ +%% This is a font-specific configuration file for the `microtype' package. +%% It may contain settings for font expansion and character protrusion, +%% tracking, interword spacing and additional kerning, as well as +%% character inheritance declarations. +%% 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: +%% Antonis Tsolomitis <antonis.tsolomitis{at}gmail.com> +%% +%% ------------------------------------------------------------------------ +%% +\ProvidesFile + {mt-NewComputerModern.cfg}[2021/08/08 v1.0 microtype config. file: New Computer Modern (AT)] + +%%% ----------------------------------------------------------------------- +%%% INHERITANCE + +%% for xetex (EU1) and luatex (EU2), resp. both (TU) +\DeclareCharacterInheritance + { encoding = {EU1,EU2,TU}, + family = {New Computer Modern} } + { + A = {À,Á,Â,Ã,Ä,Å,Ā,Ă,Ą,Ǻ,Ȁ,Ạ,Ả,Ấ,Ầ,Ẩ,Ẫ,Ậ,Ắ,Ằ,Ẳ,Ặ, + Α,Ά,ᾼ,Ά,Ᾰ,Ᾱ % Ἁ,Ἂ,Ἃ,Ἄ,Ἅ,Ἆ,Ἇ,ᾈ,ᾉ,ᾊ,ᾋ,ᾌ,ᾍ,ᾎ,ᾏ,Ὰ, % Greek + }, + Æ = {Ǽ}, + B = {฿, + Β}, % Greek + C = {Ç,Ć,Ĉ,Ċ,Č}, + D = {Ð,Ď,Đ,Ḍ,Ḏ}, + E = {È,É,Ê,Ë,Ē,Ĕ,Ė,Ę,Ě,Ȅ,Ẹ,Ẻ,Ẽ,Ề,Ế,Ễ,Ể,Ệ, + Ε}, % Greek + (l)E = {Έ,Ἐ,Ἑ,Ἒ,Ἓ,Ἔ,Ἕ,Ὲ,Έ}, % Greek accents fully protruded left + G = {Ĝ,Ğ,Ġ,Ģ,Ǧ,Ǵ}, + H = {Ĥ,Ħ,Ḥ,Ḧ,Ḫ, + Η,ῌ % Greek + }, + (l)H = {Ἠ,Ἡ,Ἢ,Ἣ,Ἤ,Ἥ,Ἦ,Ἧ,ᾘ,ᾙ,ᾚ,ᾛ,ᾜ,ᾝ,ᾞ,ᾟ}, % Greek accents fully protruded left + %(l)/uni1FCC.alt = {/uni1F98.alt}, + I = {Ì,Í,Î,Ï,Ĩ,Ī,Ĭ,Į,İ,Ȉ,Ỉ,Ị, + Ι,Ῐ,Ῑ % Greek + }, + (l)I = {Ἰ,Ἱ,Ἲ,Ἳ,Ἴ,Ἵ,Ἶ,Ἷ,Ὶ,Ί}, % Greek + J = {Ĵ}, + K = {Ķ, + Κ}, % Greek + L = {Ĺ,Ļ,Ł,Ḷ}, % Ľ,Ŀ,Ḹ + M = {Μ}, % Greek + N = {Ñ,Ń,Ņ,Ň,Ṅ,Ṇ, + Ν}, % Greek + O = {Ò,Ó,Ô,Õ,Ö,Ø,Ō,Ŏ,Ő,Ọ,Ơ,Ǫ,Ǿ,Ȍ,Ỏ,Ố,Ồ,Ổ,Ỗ,Ộ,Ớ,Ờ,Ỡ,Ở,Ợ, + Ο}, % Greek + (l)O = {Ό,Ὀ,Ὁ,Ὂ,Ὃ,Ὄ,Ὅ,Ὸ}, % Greek accents except Ό that has indep. protrusion numbers (below) + P = {Ρ}, % Greek + (l)P = {Ῥ}, % Greek accents fully protruded left + R = {Ŕ,Ŗ,Ř,Ȑ,Ṛ,Ṙ,Ṝ}, + S = {Ś,Ŝ,Ş,Š,Ș,Ṣ}, + T = {Ţ,Ť,Ț,Ṭ,Ṯ, + Τ}, % Greek + U = {Ù,Ú,Û,Ü,Ũ,Ū,Ŭ,Ů,Ű,Ų,Ư,Ȕ,Ụ,Ủ,Ứ,Ừ,Ử,Ữ,Ự}, + W = {Ŵ,Ẁ,Ẃ,Ẅ}, + X = {Χ}, % Greek + Y = {Ý,Ŷ,Ÿ,Ỵ,Ỷ,Ỹ}, + Υ = {Ϋ,Ῠ,Ῡ}, + (l)Υ = {Ύ,Ὺ,Ύ,Ὑ,Ὓ,Ὕ,Ὗ}, + Z = {Ź,Ż,Ž,Ẓ, + Ζ}, % Greek + a = {à,á,â,ã,ä,å,ā,ă,ą,ǻ,ȁ,ạ,ả,ấ,ầ,ẩ,ẫ,ậ,ắ,ằ,ẳ,ẵ}, + æ = {ǽ}, + c = {ç,ć,ĉ,ċ,č}, + d = {đ,ḍ,ḏ}, + e = {è,é,ê,ë,ē,ĕ,ė,ę,ě,ȅ,ẹ,ẻ,ẽ,ế,ề,ể,ễ,ệ}, + f = {ff}, % Unicode 64256, glyph name in Latin Modern Roman: /f_f ; in New Computer Modern: /ff + g = {ĝ,ğ,ġ,ģ,ǧ,ǵ}, + h = {ĥ,ħ,ḥ,ḧ,ḫ}, + i = {ì,í,î,ï,ĩ,ī,ĭ,į,ı,ȉ,ỉ,ị}, + j = {ĵ}, + k = {ķ}, + l = {ĺ,ļ,ł,ḷ,ḹ}, % ľ,l· + n = {ñ,ń,ņ,ň,ṅ,ṇ}, + o = {ò,ó,ô,õ,ö,ø,ō,ŏ,ő,ọ,ơ,ǫ,ǿ,ȍ,ỏ,ố,ồ,ổ,ỗ,ộ,ớ,ờ,ỡ,ở,ợ + ,ο,ό,ὀ,ὁ,ὂ,ὃ,ὄ,ὅ,ὸ,ό % Greek + }, + r = {ŕ,ŗ,ř,ȑ,ṛ,ṙ,ṝ}, + s = {ś,ŝ,ş,š,ș,ṣ}, + t = {ţ,ț,ṭ,ṯ,ẗ}, % ť + u = {ù,ú,û,ü,ũ,ū,ŭ,ů,ű,ų,ư,ȕ,ụ,ủ,ứ,ừ,ử,ữ,ự}, + w = {ŵ,ẁ,ẃ,ẅ}, + y = {ý,ŷ,ÿ,ỳ,ỵ,ỷ,ỹ}, + z = {ź,ż,ž,ẓ}, + α = {ἁ,ἂ,ἃ,ἄ,ἅ,ἆ,ἇ,ᾀ,ᾁ,ᾂ,ᾃ,ᾄ,ᾅ,ᾆ,ᾇ,ὰ}, + ε = {έ,ἐ,ἑ,ἒ,ἓ,ἔ,ἕ,ὲ,έ}, + η = {ἠ,ἡ,ἢ,ἣ,ἤ,ἥ,ἦ,ἧ,ᾐ,ᾑ,ᾒ,ᾓ,ᾔ,ᾕ,ᾖ}, + ι = {ἰ,ἱ,ὶ,ί,ῐ,ῑ,ϊ,ΐ}, + ϊ = {ἲ,ἳ,ἴ,ἵ,ἶ,ἷ,ῐ,ῑ,ΐ}, + υ = {ύ,ὺ,ύ,ὑ,ὓ,ὕ,ὗ,ϋ,ῠ,ῡ,ϋ,ΰ}, + ω = {ώ,ὠ,ὡ,ὢ,ὣ,ὤ,ὥ,ὦ,ὧ,ᾠ,ᾡ,ᾢ,ᾣ,ᾤ,ᾥ,ᾦ}, + } + +%%% ----------------------------------------------------------------------- +%%% PROTRUSION + +\SetProtrusion + [ name = NCM-default ] + { encoding = {EU1,EU2,TU}, + family = {New Computer Modern} } + { + A = {50,50}, + Æ = {50, }, + F = { ,50}, + J = {50, }, + K = { ,50}, + L = { ,50}, + T = {50,50}, + V = {50,50}, + W = {50,50}, + X = {50,50}, + Y = {50,50}, + /a.end = {,330}, + /e.end = {,350}, + k = { ,50}, + /k.alt = { ,50}, + r = { ,50}, + /r.end = {,300}, + /m.end = {,200}, + /n.end = {,300}, + t = { ,70}, + v = {50,50}, + w = {50,50}, + x = {50,50}, + y = {50,70}, + 0 = { ,50}, + 1 = {100,200}, + 2 = {50,50}, + 3 = {50,50}, + 4 = {70,70}, + 5 = { ,50}, + 6 = { ,50}, + 7 = {50,100}, + 8 = { ,50}, + 9 = { ,50}, + . = { ,700}, + {,}= { ,500}, + : = { ,500}, + ; = { ,500}, + ! = { ,100}, + ? = { ,200}, + @ = {50,50}, + ~ = {200,250}, + \% = {50,50}, + * = {300,300}, + + = {250,250}, + - = {400,500}, % /hyphen + – = {400,300}, % /endash + — = {300,200}, % /emdash + _ = {200,200}, % /underscore + / = {200,300}, + /backslash = {200,300}, + ' = {300,400}, % /quotesingle + ‘ = {300,400}, ’ = {300,400}, + “ = {300,300}, ” = {300,300}, + ‚ = {400,400}, „ = {400,400}, + ‹ = {400,400}, › = {300,500}, + « = {300,200}, » = {100,400}, + ¡ = {100, }, ¿ = {100, }, + ( = {300, }, ) = { ,300}, + < = {200,100}, > = {100,200}, + /braceleft = {400,200}, /braceright = {200,400}, + /angleleft = {400, }, /angleright = { ,400}, + † = {100,100}, + ‡ = { 80, 80}, + • = {200,200}, + · = {400,450}, % / periodcentered + ℃ = { 80, 50}, + ₡ = { , 50}, + ° = {400,400}, + ™ = {100,200}, + © = {100,100}, + ® = {100,100}, + ª = {100,200}, + º = {100,200}, + ¹ = {200,250}, + ² = { 50,100}, + ³ = { 50,100}, + ¬ = {200, }, + − = {300,300}, + ± = {150,200}, + × = {150,250}, + ÷ = {150,250}, + € = {100, }, + /one.oldstyle = {100,100}, + /two.oldstyle = { 50, 50}, + /three.oldstyle = { 30, 80}, + /four.oldstyle = { 50, 50}, + /seven.oldstyle = { 50, 80}, + Ά = {50,50}, % /Alphatonos + Ὰ = {120,50}, % + Ἀ = {120,50}, % + Ἁ = {80,50}, % + Ἂ = {220,50}, % + Ἃ = {220,50}, % + Ἄ = {170,50}, % + Ἅ = {170,50}, % + Ἆ = {190,50}, % + Ἇ = {190,50}, % + ᾈ = {150,50}, % + ᾉ = {80,50}, % + ᾊ = {220,50}, % + ᾋ = {220,50}, % + ᾌ = {170,50}, % + ᾍ = {170,50}, % + ᾎ = {210,50}, % + ᾏ = {210,50}, % + /uni1FBC.alt = {,205}, % Alpha prosgegrammeni + /uni1F88.alt = {50,190}, %Alpha psili prosgegrammeni + /uni1F89.alt = {,200}, %Alpha dasia prosgegrammeni + /uni1F8A.alt = {130,180}, %Alpha psili baria prosgegrammeni + /uni1F8B.alt = {130,190}, %Alpha dasia baria prosgegrammeni + /uni1F8C.alt = {100,190}, %Alpha psili oxia prosgegrammeni + /uni1F8D.alt = {70,190}, %Alpha dasia oxia prosgegrammeni + /uni1F8E.alt = {120,190}, %Alpha psili perispomeni prosgegrammeni + /uni1F8F.alt = {120,190}, %Alpha dasia perispomeni prosgegrammeni + % + /uni1FCC.alt = {,205}, % Eta prosgegrammeni + /uni1F98.alt = {185,170}, %Eta psili prosgegrammeni + /uni1F99.alt = {185,170}, %Eta dasia prosgegrammeni + /uni1F9A.alt = {220,170}, %Eta psili baria prosgegrammeni + /uni1F9B.alt = {220,170}, %Eta dasia baria prosgegrammeni + /uni1F9C.alt = {220,170}, %Eta psili oxia prosgegrammeni + /uni1F9D.alt = {220,170}, %Eta dasia oxia prosgegrammeni + /uni1F9E.alt = {255,170}, %Eta psili perispomeni prosgegrammeni + /uni1F9F.alt = {255,170}, %Eta dasia perispomeni prosgegrammeni + % + Ό = {95,50}, % + Γ = { ,180}, % /Gamma + Δ = {50,50}, % /Delta + Θ = { 50, 50}, % /Theta + Λ = {50,50}, % /Lambda + Σ = { 50, 50}, % /Sigma + Υ = {80,80}, % /Upsilon + Φ = { 50, 50}, % /Phi + Ψ = { 50, 50}, % /Psi + Ω = { 20, 30}, % /Omega + Ώ = {150,30}, + Ὠ = {220,30}, + Ὡ = {205,30}, + Ὢ = {285,30}, + Ὣ = {285,30}, + Ὤ = {270,30}, + Ὥ = {270,30}, + Ὦ = {310,30}, + Ὧ = {310,30}, + ᾨ = {205,30}, + ᾩ = {205,30}, + ᾪ = {285,30}, + ᾫ = {285,30}, + ᾬ = {270,30}, + ᾭ = {270,30}, + ᾮ = {310,30}, + ᾯ = {310,30}, + /uni1FFC.alt = {,230}, % Omega prosgegrammeni + /uni1FA8.alt = {185,190}, %Omega psili prosgegrammeni + /uni1FA9.alt = {185,190}, %Omega dasia prosgegrammeni + /uni1FAA.alt = {220,190}, %Omega psili baria prosgegrammeni + /uni1FAB.alt = {220,190}, %Omega dasia baria prosgegrammeni + /uni1FAC.alt = {220,190}, %Omega psili oxia prosgegrammeni + /uni1FAD.alt = {220,190}, %Omega dasia oxia prosgegrammeni + /uni1FAE.alt = {255,190}, %Omega psili perispomeni prosgegrammeni + /uni1FAF.alt = {255,190}, %Omega dasia perispomeni prosgegrammeni + % + α = {,50}, + γ = {50,50}, + ζ = {,50}, + θ = {30,40}, + ι = {,50}, + ϊ = {-20,-30}, + κ = {50,50}, + λ = {50,50}, + ν = {50,25}, + π = {50,50}, + σ = {,50}, + ς = {,50}, + τ = {50,50}, + χ = {50,50}, + ψ = {50,50}, + } + +\SetProtrusion + [ name = NCM-it ] + { encoding = {EU1,EU2,TU}, + family = {New Computer Modern}, + shape = {it,sl} } + { + A = {125,100}, + Æ = {125,-55}, + B = {90,-40}, + C = {145,-75}, + D = {75, -28}, + E = {80,-55}, + F = {85,-80}, + G = {153,-15}, + H = {73,-60}, + I = {140,-120}, + IJ = {140,-80}, + J = {135,-80}, + K = {70,-30}, + L = {87, 40}, + M = {67,-45}, + N = {75,-55}, + O = {150,-30}, + Œ = {150,-55}, + P = {82,-50}, + Q = {150,-30}, + R = {75, 15}, + S = {90,-65}, + $ = {100,-20}, + T = {220,-85}, + U = {230,-55}, + V = {260,-60}, + W = {185,-55}, + X = {70,-30}, + Y = {250,-60}, + Z = {90,-60}, + a = {150,-10}, + b = {170, }, + c = {173,-10}, + d = {150,-55}, + e = {180, }, + f = { ,-250}, + g = {150,-10}, + h = {100, }, + i = {210, }, + ij = {210,-40}, + j = { ,-40}, + k = {110,-50}, + l = {240,-110}, + m = {80, }, + n = {115, }, + o = {155, }, + q = {170,-40}, + r = {155,-40}, + s = {130, }, + t = {230,-10}, + u = {120, }, + v = {140,-25}, + w = {98,-20}, + x = {65,-40}, + y = {130,-20}, + z = {110,-80}, + /a.end = {,330}, %Fix + /e.end = {,350}, %Fix + /k.alt = { ,50}, %Fix + /r.end = {,300}, %Fix + /m.end = {,200}, %Fix + /n.end = {,300}, %Fix + 0 = {170,-85}, + 1 = {230,110}, + 2 = {130,-70}, + 3 = {140,-70}, + 4 = {130,80}, + 5 = {160, }, + 6 = {175,-30}, + 7 = {250,-150}, + 8 = {130,-40}, + 9 = {155,-80}, + . = { ,500}, + {,}= { ,450}, + : = { ,300}, + ; = { ,300}, + & = {130,30}, + \% = {180,50}, + * = {380,20}, + + = {180,200}, + @ = {180,10}, + ~ = {200,150}, + ( = {300, }, ) = { ,70}, + / = {100,100}, + - = {500,300}, % /hyphen + – = {500,300}, % /endash + — = {400,170}, % /emdash + _ = {100,200}, % /underscore + ' = {300,400}, % /quotesingle + " = {500,300}, + ‘ = {800,200}, ’ = {800,-20}, + “ = {540,100}, ” = {500,100}, + ‚ = {300,700}, „ = {200,600}, + ‹ = {500,300}, › = {400,400}, + « = {400,100}, » = {200,300}, + ¡ = {200, }, ¿ = {200, }, + < = {300,100}, > = {200,100}, + /backslash = {300,300}, + /braceleft = {400,100}, /braceright = {200,200}, + † = {200, 80}, + ‡ = {120, 80}, + • = {220,100}, + · = {550,300}, % / periodcentered + ℃ = {170, }, + ₡ = {100, 50}, + ¶ = {200, }, + ° = {500,300}, + ™ = {200, 70}, + © = { 50, 70}, + ® = { 50, 70}, + ª = {140,100}, + º = {140,100}, + ¹ = {400,150}, + ² = {250, 80}, + ³ = {250, 80}, + ¬ = {250, 80}, + − = {300,200}, + ± = {150,170}, + × = {200,200}, + ÷ = {200,200}, + € = {150, }, + /one.oldstyle = {100,100}, + /two.oldstyle = {100, 80}, + /three.oldstyle = { 80, 50}, + /four.oldstyle = { 80, 80}, + /five.oldstyle = { 50, }, + /six.oldstyle = { 50, }, + /seven.oldstyle = { 80, 80}, + /eight.oldstyle = { 50, }, + Γ = {100,120}, % /Gamma + Δ = {120,100}, % /Delta + Θ = {120, 50}, % /Theta + Λ = {160,100}, % /Lambda + Ξ = {100,}, % /Xi + Π = {100,}, % /Pi + Σ = {100, 50}, % /Sigma + Υ = {260,100}, % /Upsilon + Φ = {130, 70}, % /Phi + Ψ = {130, 50}, % /Psi + Ω = { 50,}, % /Omega + Ὰ = {190,50}, % + Ἀ = {220,50}, % + Ἁ = {200,50}, % + Ἂ = {300,50}, % + Ἃ = {300,50}, % + Ἄ = {300,50}, % + Ἅ = {300,50}, % + Ἆ = {320,50}, % + Ἇ = {320,50}, % + ᾈ = {200,50}, % + ᾉ = {200,50}, % + ᾊ = {300,50}, % + ᾋ = {300,50}, % + ᾌ = {300,50}, % + ᾍ = {300,50}, % + ᾎ = {320,50}, % + ᾏ = {320,50}, % + /uni1FBC.alt = {,205}, % Alpha prosgegrammeni + /uni1F88.alt = {50,190}, %Alpha psili prosgegrammeni + /uni1F89.alt = {,200}, %Alpha dasia prosgegrammeni + /uni1F8A.alt = {130,180}, %Alpha psili baria prosgegrammeni + /uni1F8B.alt = {130,190}, %Alpha dasia baria prosgegrammeni + /uni1F8C.alt = {100,190}, %Alpha psili oxia prosgegrammeni + /uni1F8D.alt = {70,190}, %Alpha dasia oxia prosgegrammeni + /uni1F8E.alt = {120,190}, %Alpha psili perispomeni prosgegrammeni + /uni1F8F.alt = {120,190}, %Alpha dasia perispomeni prosgegrammeni + % + /uni1FCC.alt = {,205}, % Eta prosgegrammeni + /uni1F98.alt = {185,170}, %Eta psili prosgegrammeni + /uni1F99.alt = {185,170}, %Eta dasia prosgegrammeni + /uni1F9A.alt = {220,170}, %Eta psili baria prosgegrammeni + /uni1F9B.alt = {220,170}, %Eta dasia baria prosgegrammeni + /uni1F9C.alt = {220,170}, %Eta psili oxia prosgegrammeni + /uni1F9D.alt = {220,170}, %Eta dasia oxia prosgegrammeni + /uni1F9E.alt = {255,170}, %Eta psili perispomeni prosgegrammeni + /uni1F9F.alt = {255,170}, %Eta dasia perispomeni prosgegrammeni + % + Ό = {95,50}, % + Ω = {120, 30}, % /Omega + Ώ = {160,30}, + Ὠ = {250,30}, + Ὡ = {250,30}, + Ὢ = {300,30}, + Ὣ = {300,30}, + Ὤ = {300,30}, + Ὥ = {300,30}, + Ὦ = {330,30}, + Ὧ = {330,30}, + ῼ = {30,30}, + ᾨ = {230,30}, + ᾩ = {230,30}, + ᾪ = {300,30}, + ᾫ = {300,30}, + ᾬ = {300,30}, + ᾭ = {300,30}, + ᾮ = {330,30}, + ᾯ = {330,30}, + /uni1FFC.alt = {,230}, % Omega prosgegrammeni + /uni1FA8.alt = {185,190}, %Omega psili prosgegrammeni + /uni1FA9.alt = {185,190}, %Omega dasia prosgegrammeni + /uni1FAA.alt = {220,190}, %Omega psili baria prosgegrammeni + /uni1FAB.alt = {220,190}, %Omega dasia baria prosgegrammeni + /uni1FAC.alt = {220,190}, %Omega psili oxia prosgegrammeni + /uni1FAD.alt = {220,190}, %Omega dasia oxia prosgegrammeni + /uni1FAE.alt = {255,190}, %Omega psili perispomeni prosgegrammeni + /uni1FAF.alt = {255,190}, %Omega dasia perispomeni prosgegrammeni + % + α = {50,50}, + γ = {100,50}, + δ = {30,50}, + ε = {30,}, + ζ = {20,50}, + θ = {30,40}, + ι = {,50}, + ϊ = {-20,-30}, + κ = {50,50}, + λ = {-20,50}, + ν = {50,25}, + ο ={40,}, + π = {50,50}, + σ = {40,50}, + ς = {20,50}, + τ = {50,50}, + υ = {80,}, + φ = {80,}, + χ = {20,}, + ψ = {80,}, + } + +\endinput +%% +%% End of file `mt-NewComputerModern.cfg'. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-Palatino.cfg b/Master/texmf-dist/tex/latex/microtype/mt-Palatino.cfg index 61dfd46366b..74289387ab3 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-Palatino.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-Palatino.cfg @@ -18,11 +18,12 @@ %% 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 has the LPPL maintenance status `maintained'. %% -%% This work consists of the files microtype.dtx and microtype.ins and the -%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, -%% microtype-xetex.def, microtype.lua and letterspace.sty. +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-Lato.cfg b/Master/texmf-dist/tex/latex/microtype/mt-TU-basic.cfg index 9020d15e42f..81f197d99b9 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-Lato.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-TU-basic.cfg @@ -1,10 +1,10 @@ %% -%% This is file `mt-Lato.cfg', +%% This is file `mt-TU-basic.cfg', %% generated with the docstrip utility. %% %% The original source files were: %% -%% microtype-utf.dtx (with options: `Lato') +%% microtype-utf.dtx (with options: `TU-basic') %% %% ------------------------------------------------------------------------ %% @@ -18,11 +18,12 @@ %% 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 has the LPPL maintenance status `maintained'. %% -%% This work consists of the files microtype.dtx and microtype.ins and the -%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, -%% microtype-xetex.def, microtype.lua and letterspace.sty. +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. @@ -38,7 +39,7 @@ %% ------------------------------------------------------------------------ %% \ProvidesFile - {mt-Lato.cfg}[2021/02/22 v1.0 microtype config. file: Lato (RS)] + {mt-TU-basic.cfg}[2021/06/22 v1.1 microtype config. file: fonts with basic glyph set (RS)] %%% ----------------------------------------------------------------------- %%% INHERITANCE @@ -46,37 +47,37 @@ %% for xetex (EU1) and luatex (EU2), resp. both (TU) \DeclareCharacterInheritance { encoding = {TU,EU1,EU2}, - family = {Lato} } - { A = {À,Á,Â,Ã,Ä,Å,Ą}, - a = {à,á,â,ã,ä,å,ą}, - C = {Ć,Ç}, - c = {ć,ç}, + family = {TU-basic} } + { A = {À,Á,Â,Ã,Ä,Å}, + a = {à,á,â,ã,ä,å}, + C = {Ç}, + c = {ç}, D = {Ð}, - E = {È,É,Ê,Ë,Ę}, - e = {è,é,ê,ë,ę}, + E = {È,É,Ê,Ë}, + e = {è,é,ê,ë}, I = {Ì,Í,Î,Ï}, i = {ì,í,î,ï,ı}, L = {Ł}, l = {ł}, - N = {Ń,Ñ}, - n = {ń,ñ}, + N = {Ñ}, + n = {ñ}, O = {Ø,Ò,Ó,Ô,Õ,Ö}, o = {ø,ò,ó,ô,õ,ö}, - S = {Ś,Š}, - s = {ś,š}, + S = {Š}, + s = {š}, U = {Ù,Ú,Û,Ü}, u = {ù,ú,û,ü}, Y = {Ý,Ÿ}, y = {ý,ÿ}, - Z = {Ź,Ż,Ž}, - z = {ź,ż,ž} + Z = {Ž}, + z = {ž} } %%% ----------------------------------------------------------------------- %%% PROTRUSION - %% No settings yet. + %% No settings. \endinput %% -%% End of file `mt-Lato.cfg'. +%% End of file `mt-TU-basic.cfg'. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-FontAwesome.cfg b/Master/texmf-dist/tex/latex/microtype/mt-TU-empty.cfg index 7880d7bd6e8..1f4119a6fe9 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-FontAwesome.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-TU-empty.cfg @@ -1,10 +1,10 @@ %% -%% This is file `mt-FontAwesome.cfg', +%% This is file `mt-TU-empty.cfg', %% generated with the docstrip utility. %% %% The original source files were: %% -%% microtype-utf.dtx (with options: `FontAwesome') +%% microtype-utf.dtx (with options: `TU-empty') %% %% ------------------------------------------------------------------------ %% @@ -18,11 +18,12 @@ %% 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 has the LPPL maintenance status `maintained'. %% -%% This work consists of the files microtype.dtx and microtype.ins and the -%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, -%% microtype-xetex.def, microtype.lua and letterspace.sty. +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. @@ -38,7 +39,7 @@ %% ------------------------------------------------------------------------ %% \ProvidesFile - {mt-FontAwesome.cfg}[2021/02/22 v1.0 microtype config. file: Font Awesome (RS)] + {mt-TU-empty.cfg}[2021/06/22 v1.1 microtype config. file: fonts with nonstandard glyph set (RS)] %%% ----------------------------------------------------------------------- %%% INHERITANCE @@ -46,7 +47,7 @@ %% for xetex (EU1) and luatex (EU2), resp. both (TU) \DeclareCharacterInheritance { encoding = {TU,EU1,EU2}, - family = {FontAwesome} } + family = {TU-empty} } { } %%% ----------------------------------------------------------------------- @@ -55,9 +56,9 @@ \SetProtrusion [ name = empty ] { encoding = {TU,EU1,EU2}, - family = {FontAwesome} } + family = {TU-empty} } { } \endinput %% -%% End of file `mt-FontAwesome.cfg'. +%% End of file `mt-TU-empty.cfg'. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-bch.cfg b/Master/texmf-dist/tex/latex/microtype/mt-bch.cfg index 362c79fc4c3..cfbffb8b23f 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-bch.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-bch.cfg @@ -18,11 +18,12 @@ %% 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 has the LPPL maintenance status `maintained'. %% -%% This work consists of the files microtype.dtx and microtype.ins and the -%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, -%% microtype-xetex.def, microtype.lua and letterspace.sty. +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-blg.cfg b/Master/texmf-dist/tex/latex/microtype/mt-blg.cfg index 130bfb4490f..ccc24030b2f 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-blg.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-blg.cfg @@ -18,11 +18,12 @@ %% 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 has the LPPL maintenance status `maintained'. %% -%% This work consists of the files microtype.dtx and microtype.ins and the -%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, -%% microtype-xetex.def, microtype.lua and letterspace.sty. +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-cmr.cfg b/Master/texmf-dist/tex/latex/microtype/mt-cmr.cfg index ca83096e37e..9d33046d912 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-cmr.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-cmr.cfg @@ -18,11 +18,12 @@ %% 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 has the LPPL maintenance status `maintained'. %% -%% This work consists of the files microtype.dtx and microtype.ins and the -%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, -%% microtype-xetex.def, microtype.lua and letterspace.sty. +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. @@ -107,7 +108,7 @@ "06 = { 50, 50}, % \Sigma "07 = {100,100}, % \Upsilon "08 = { 50, 50}, % \Phi - "09 = { 50, 50} % \Psi + "09 = { 50, 50}, % \Psi } \SetProtrusion @@ -280,7 +281,7 @@ "07 = {200,150}, % \Upsilon "08 = {150, 50}, % \Phi "09 = {150,100}, % \Psi - "0A = { 50, 50} % \Omega + "0A = { 50, 50}, % \Omega } \SetProtrusion diff --git a/Master/texmf-dist/tex/latex/microtype/mt-euf.cfg b/Master/texmf-dist/tex/latex/microtype/mt-euf.cfg index fcd09591e5b..c8395f215b4 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-euf.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-euf.cfg @@ -18,11 +18,12 @@ %% 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 has the LPPL maintenance status `maintained'. %% -%% This work consists of the files microtype.dtx and microtype.ins and the -%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, -%% microtype-xetex.def, microtype.lua and letterspace.sty. +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-eur.cfg b/Master/texmf-dist/tex/latex/microtype/mt-eur.cfg index 215d3110e8d..12c495205af 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-eur.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-eur.cfg @@ -18,11 +18,12 @@ %% 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 has the LPPL maintenance status `maintained'. %% -%% This work consists of the files microtype.dtx and microtype.ins and the -%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, -%% microtype-xetex.def, microtype.lua and letterspace.sty. +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-eus.cfg b/Master/texmf-dist/tex/latex/microtype/mt-eus.cfg index 501105f0b19..e63facd1233 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-eus.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-eus.cfg @@ -18,11 +18,12 @@ %% 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 has the LPPL maintenance status `maintained'. %% -%% This work consists of the files microtype.dtx and microtype.ins and the -%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, -%% microtype-xetex.def, microtype.lua and letterspace.sty. +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-msa.cfg b/Master/texmf-dist/tex/latex/microtype/mt-msa.cfg index 06f49ce8c1c..e1d22540b2c 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-msa.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-msa.cfg @@ -18,11 +18,12 @@ %% 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 has the LPPL maintenance status `maintained'. %% -%% This work consists of the files microtype.dtx and microtype.ins and the -%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, -%% microtype-xetex.def, microtype.lua and letterspace.sty. +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-msb.cfg b/Master/texmf-dist/tex/latex/microtype/mt-msb.cfg index f54a6d474b0..6ab68068421 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-msb.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-msb.cfg @@ -18,11 +18,12 @@ %% 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 has the LPPL maintenance status `maintained'. %% -%% This work consists of the files microtype.dtx and microtype.ins and the -%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, -%% microtype-xetex.def, microtype.lua and letterspace.sty. +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-mvs.cfg b/Master/texmf-dist/tex/latex/microtype/mt-mvs.cfg index 2585d715a0b..6a654603358 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-mvs.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-mvs.cfg @@ -18,11 +18,12 @@ %% 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 has the LPPL maintenance status `maintained'. %% -%% This work consists of the files microtype.dtx and microtype.ins and the -%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, -%% microtype-xetex.def, microtype.lua and letterspace.sty. +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-pmn.cfg b/Master/texmf-dist/tex/latex/microtype/mt-pmn.cfg index a0a853e8fa1..c13c9c79d59 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-pmn.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-pmn.cfg @@ -18,11 +18,12 @@ %% 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 has the LPPL maintenance status `maintained'. %% -%% This work consists of the files microtype.dtx and microtype.ins and the -%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, -%% microtype-xetex.def, microtype.lua and letterspace.sty. +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-ppl.cfg b/Master/texmf-dist/tex/latex/microtype/mt-ppl.cfg index 1c55ce86933..5470decb919 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-ppl.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-ppl.cfg @@ -18,11 +18,12 @@ %% 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 has the LPPL maintenance status `maintained'. %% -%% This work consists of the files microtype.dtx and microtype.ins and the -%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, -%% microtype-xetex.def, microtype.lua and letterspace.sty. +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg b/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg index e00d1106e8c..38437362835 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg @@ -18,11 +18,12 @@ %% 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 has the LPPL maintenance status `maintained'. %% -%% This work consists of the files microtype.dtx and microtype.ins and the -%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, -%% microtype-xetex.def, microtype.lua and letterspace.sty. +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-ugm.cfg b/Master/texmf-dist/tex/latex/microtype/mt-ugm.cfg index 6f9740c4acb..8d67031acf6 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-ugm.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-ugm.cfg @@ -18,11 +18,12 @@ %% 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 has the LPPL maintenance status `maintained'. %% -%% This work consists of the files microtype.dtx and microtype.ins and the -%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, -%% microtype-xetex.def, microtype.lua and letterspace.sty. +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-zpeu.cfg b/Master/texmf-dist/tex/latex/microtype/mt-zpeu.cfg index 7c963c7054c..4278b9a8a1d 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-zpeu.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-zpeu.cfg @@ -18,11 +18,12 @@ %% 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 has the LPPL maintenance status `maintained'. %% -%% This work consists of the files microtype.dtx and microtype.ins and the -%% derived files microtype.sty, microtype-pdftex.def, microtype-luatex.def, -%% microtype-xetex.def, microtype.lua and letterspace.sty. +%% This work consists of the files microtype.dtx, microtype-utf.dtx and +%% microtype.ins and the derived files microtype.sty, microtype-pdftex.def, +%% microtype-luatex.def, microtype-xetex.def, microtype.lua, letterspace.sty +%% and microtype-show.sty. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. |