diff options
author | Karl Berry <karl@freefriends.org> | 2022-07-17 20:01:08 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-07-17 20:01:08 +0000 |
commit | ea754d8138c914e69555b2cf181ac05cdbe9b8fd (patch) | |
tree | c7c754bff8964c6c52dd71ce1dc790dcd529b3ca /Master/texmf-dist/tex/latex-dev/base | |
parent | aad6090f06fd84391dbcac7f0617d77d510d3a22 (diff) |
latex-base-dev (17jul22)
git-svn-id: svn://tug.org/texlive/trunk@63922 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex-dev/base')
40 files changed, 154 insertions, 170 deletions
diff --git a/Master/texmf-dist/tex/latex-dev/base/article.cls b/Master/texmf-dist/tex/latex-dev/base/article.cls index d3c6498a07b..1488c02e760 100644 --- a/Master/texmf-dist/tex/latex-dev/base/article.cls +++ b/Master/texmf-dist/tex/latex-dev/base/article.cls @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{article} - [2021/10/04 v1.4n + [2022/07/02 v1.4n Standard LaTeX document class] \newcommand\@ptsize{} \newif\if@restonecol diff --git a/Master/texmf-dist/tex/latex-dev/base/bk10.clo b/Master/texmf-dist/tex/latex-dev/base/bk10.clo index 728e33406a5..3befcaa3945 100644 --- a/Master/texmf-dist/tex/latex-dev/base/bk10.clo +++ b/Master/texmf-dist/tex/latex-dev/base/bk10.clo @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{bk10.clo} - [2021/10/04 v1.4n + [2022/07/02 v1.4n Standard LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xpt\@xiipt diff --git a/Master/texmf-dist/tex/latex-dev/base/bk11.clo b/Master/texmf-dist/tex/latex-dev/base/bk11.clo index 4206d873481..5bec4cf1184 100644 --- a/Master/texmf-dist/tex/latex-dev/base/bk11.clo +++ b/Master/texmf-dist/tex/latex-dev/base/bk11.clo @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{bk11.clo} - [2021/10/04 v1.4n + [2022/07/02 v1.4n Standard LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xipt{13.6}% diff --git a/Master/texmf-dist/tex/latex-dev/base/bk12.clo b/Master/texmf-dist/tex/latex-dev/base/bk12.clo index e33fefc2e81..b38d1c7c590 100644 --- a/Master/texmf-dist/tex/latex-dev/base/bk12.clo +++ b/Master/texmf-dist/tex/latex-dev/base/bk12.clo @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{bk12.clo} - [2021/10/04 v1.4n + [2022/07/02 v1.4n Standard LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xiipt{14.5}% diff --git a/Master/texmf-dist/tex/latex-dev/base/book.cls b/Master/texmf-dist/tex/latex-dev/base/book.cls index d4f775775ac..28a99524e79 100644 --- a/Master/texmf-dist/tex/latex-dev/base/book.cls +++ b/Master/texmf-dist/tex/latex-dev/base/book.cls @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{book} - [2021/10/04 v1.4n + [2022/07/02 v1.4n Standard LaTeX document class] \newcommand\@ptsize{} \newif\if@restonecol diff --git a/Master/texmf-dist/tex/latex-dev/base/doc.sty b/Master/texmf-dist/tex/latex-dev/base/doc.sty index 586b35af069..bbaa9a9937e 100644 --- a/Master/texmf-dist/tex/latex-dev/base/doc.sty +++ b/Master/texmf-dist/tex/latex-dev/base/doc.sty @@ -53,7 +53,7 @@ \DeclareCurrentRelease{v3}{2022-06-01} \ProvidesPackage{doc} - [2022/06/08 v3.0j + [2022/07/03 v3.0k Standard LaTeX documentation package V3 (FMi)] %% %% Package `doc' to use with LaTeX 2e @@ -67,88 +67,28 @@ \catcode`\^^A=14 \catcode`\^^X=14 \AtBeginDocument{\catcode`\^^A=14\relax\catcode`\^^X=14\relax} -\ExplSyntaxOn -\newif \ifdoc@noprint -\newif \ifdoc@noindex -\newif \ifdoc@hyperref \doc@hyperreftrue -\newif \ifdoc@multicol \doc@multicoltrue -\newif \ifdoc@debugshow -\newif \ifdoc@reportchangedates -\keys_define:nn {doc} - { - noprint .choice:, - noprint / true .code:n = { \legacy_if_set_true:n { doc@noprint } }, - noprint / false .code:n = { \legacy_if_set_false:n { doc@noprint } }, - noprint .default:n = { true }, - noindex .choice:, - noindex / true .code:n = { \legacy_if_set_true:n { doc@noindex } }, - noindex / false .code:n = { \legacy_if_set_false:n { doc@noindex } }, - noindex .default:n = { true }, - hyperref .choice:, - hyperref / true .code:n = { \legacy_if_set_true:n { doc@hyperref } }, - hyperref / false .code:n = { \legacy_if_set_false:n { doc@hyperref } }, - hyperref .default:n = { true }, - nohyperref .choice:, - nohyperref / true .code:n = { \legacy_if_set_false:n { doc@hyperref } }, - nohyperref / false .code:n = { \legacy_if_set_true:n { doc@hyperref } }, - nohyperref .default:n = { true }, - multicol .choice:, - multicol / true .code:n = { \legacy_if_set_true:n { doc@multicol } }, - multicol / false .code:n = { \legacy_if_set_false:n { doc@multicol } }, - multicol .default:n = { true }, - nomulticol .choice:, - nomulticol / true .code:n = { \legacy_if_set_false:n { doc@multicol } }, - nomulticol / false .code:n = { \legacy_if_set_true:n { doc@multicol } }, - nomulticol .default:n = { true }, - debugshow .choice:, - debugshow / true .code:n = { \legacy_if_set_true:n { doc@debugshow } }, - debugshow / false .code:n = { \legacy_if_set_false:n { doc@debugshow } }, - debugshow .default:n = { true }, - reportchangedates .choice:, - reportchangedates / true .code:n = { \legacy_if_set_true:n { doc@reportchangedates } }, - reportchangedates / false .code:n = { \legacy_if_set_false:n { doc@reportchangedates } }, - reportchangedates .default:n = { true }, - } -\newif \ifdoc@toplevel \doc@topleveltrue -\keys_define:nn {doc} +\DeclareKeys { - toplevel .choice:, - toplevel / true .code:n = { \legacy_if_set_true:n { doc@toplevel } }, - toplevel / false .code:n = { \legacy_if_set_false:n { doc@toplevel } }, - toplevel .default:n = { true }, - notoplevel .choice:, - notoplevel / true .code:n = { \legacy_if_set_false:n { doc@toplevel } }, - notoplevel / false .code:n = { \legacy_if_set_true:n { doc@toplevel } }, - notoplevel .default:n = { true } + noprint .if = {doc@noprint}, + noindex .if = {doc@noindex}, + hyperref .if = {doc@hyperref}, + nohyperref .ifnot = {doc@hyperref}, + multicol .if = {doc@multicol}, + nomulticol .ifnot = {doc@multicol}, + debugshow .if = {doc@debugshow}, + reportchangedates .if = {doc@reportchangedates}, + toplevel .if = {doc@toplevel}, + notoplevel .ifnot = {doc@toplevel}, + macrolike .if = {doc@macrolike}, + envlike .ifnot = {doc@macrolike}, + idxtype .store = \doc@idxtype, + idxgroup .store = \doc@idxgroup, + printtype .store = \doc@printtype, + outer .if = {doc@outer}, } -\newif \ifdoc@macrolike -\keys_define:nn {doc} - { - macrolike .choice:, - macrolike / true .code:n = { \legacy_if_set_true:n { doc@macrolike } }, - macrolike / false .code:n = { \legacy_if_set_false:n { doc@macrolike } }, - macrolike .default:n = { true }, - envlike .choice:, - envlike / true .code:n = { \legacy_if_set_false:n { doc@macrolike } }, - envlike / false .code:n = { \legacy_if_set_true:n { doc@macrolike } }, - envlike .default:n = { true } - } - -\keys_define:nn { doc } - { - idxtype .tl_set:N = \doc@idxtype, - idxgroup .tl_set:N = \doc@idxgroup, - printtype .tl_set:N = \doc@printtype - } -\newif\ifdoc@outer -\keys_define:nn {doc} - { - outer .choice:, - outer / true .code:n = { \legacy_if_set_true:n { doc@outer } }, - outer / false .code:n = { \legacy_if_set_false:n { doc@outer } }, - outer .default:n = { true }, - } -\ExplSyntaxOff +\doc@hyperreftrue +\doc@multicoltrue +\doc@topleveltrue \ProcessKeyOptions \newif\ifscan@allowed \scan@allowedtrue \def\SetupDoc#1{% diff --git a/Master/texmf-dist/tex/latex-dev/base/latex.ltx b/Master/texmf-dist/tex/latex-dev/base/latex.ltx index 9a7f3b7099e..7ca690a8c99 100644 --- a/Master/texmf-dist/tex/latex-dev/base/latex.ltx +++ b/Master/texmf-dist/tex/latex-dev/base/latex.ltx @@ -706,7 +706,7 @@ \def\fmtname{LaTeX2e} \edef\fmtversion {2022-06-01} -\def\patch@level{-0} +\def\patch@level{-1} \edef\development@branch@name{develop \the\year-\the\month-\the\day} \iffalse \def\reserved@a#1/#2/#3\@nil{% @@ -7745,10 +7745,16 @@ Type H <return> for immediate help.}% \let\frozen@everydisplay\everydisplay \newtoks\everymath \newtoks\everydisplay -\frozen@everymath = {\check@mathfonts - \the\everymath} -\frozen@everydisplay = {\check@mathfonts - \the\everydisplay} + +\frozen@everydisplay = {% + \aftergroup\@ignoretrue \aftergroup\ignorespaces + \check@mathfonts + \the\everydisplay} + +\frozen@everymath = {% + \aftergroup\@ignorefalse + \check@mathfonts + \the\everymath} \let\curr@math@size\@empty \def\pickup@font{% \expandafter \ifx \font@name \relax @@ -9066,8 +9072,8 @@ Type H <return> for immediate help.}% (local:~ \int_use:N\c@localmathalphabets) } \cs_gset_eq:cc { mv@#1@frozen }{ mv@#1 } \tl_gset:cx { g__nfss_frozen_mv_ #1 _tl }{ \int_use:c { c@mv@#1 } } - \group_insert_after:N \__nfss_init_mv_freeze:N \exp_after:wN - \group_insert_after:N \cs:w mv@#1@reset \cs_end: + \group_insert_after:N \__nfss_init_mv_freeze:N + \exp_after:wN \group_insert_after:N \cs:w mv@#1@reset \cs_end: \tl_gput_right:No \check@mathfonts { \exp_after:wN \group_insert_after:N \cs:w mv@#1@reset \cs_end: @@ -9088,6 +9094,7 @@ Type H <return> for immediate help.}% { \@font@info{No~ math~ alphabet~ change~ to~ frozen~ version~ #1} } + \if@ignore \ignorespaces \fi } } \cs_new_protected:Npn \__nfss_init_mv_freeze:N #1 {% @@ -14274,7 +14281,9 @@ Type H <return> for immediate help.}% \@ifundefined{opt@fam@\@currname.\@currext} {\@onefilewithoptions@clashchk{#2}} {% - \@namedef{opt@\@currname.\@currext}{#2}% + \expandafter\edef\csname opt@\@currname.\@currext\endcsname + {\zap@space#2 \@empty}% + \@namedef{@raw@opt@\@currname.\@currext}{#2}% \expandafter\expandafter\expandafter\ProcessKeyOptions \expandafter\expandafter\expandafter [\csname opt@fam@\@currname.\@currext\endcsname]% @@ -14807,6 +14816,7 @@ Type H <return> for immediate help.}% \__keys_tmp:nn { code:n } { code } { legacy_if_set:n } { if } + { legacy_if_set_inverse:n } { ifnot } { tl_set:N } { store } { usage:n } { usage } { \q_recursion_tail } { } @@ -14838,7 +14848,8 @@ Type H <return> for immediate help.}% { \keys_define:nn {#1} { unknown .undefine: } } } \bool_set_true:N \l__keys_options_loading_bool - \keys_set:nV {#1} \l__keys_options_clist + \clist_map_variable:NNn \l__keys_options_clist \CurrentOption + { \keys_set:nV {#1} \CurrentOption } \bool_set_false:N \l__keys_options_loading_bool \AtEndOfPackage { \cs_set_eq:NN \@unprocessedoptions \scan_stop: } \__keys_option_end: @@ -14852,7 +14863,7 @@ Type H <return> for immediate help.}% } \cs_new_protected:Npn \__keys_options_global:n #1 { - \cs_if_eq:NNF \@classoptionslist \scan_stop: + \cs_if_eq:NNF \@raw@classoptionslist \scan_stop: { \cs_if_eq:NNTF \@currext \@clsextension { \__keys_options_class:n {#1} } @@ -14861,47 +14872,59 @@ Type H <return> for immediate help.}% } \cs_new_protected:Npn \__keys_options_class:n #1 { - \cs_if_free:cF { opt@ \@currname . \@currext } + \cs_if_free:cF { @raw@opt@ \@currname . \@currext } { \keys_if_exist:nnTF {#1} { unknown } { \clist_put_right:Nv \l__keys_options_clist - { opt@ \@currname . \@currext } + { @raw@opt@ \@currname . \@currext } } { - \clist_map_inline:cn { opt@ \@currname . \@currext } + \clist_map_inline:cn { @raw@opt@ \@currname . \@currext } { - \__keys_options_remove:enn + \exp_args:Ne \__keys_options_class:nnn { \__keys_remove_equals:n {##1} } {##1} {#1} } } } } -\cs_new_protected:Npn \__keys_options_remove:nnn #1#2#3 +\cs_new_protected:Npn \__keys_options_class:nnn #1#2#3 { \keys_if_exist:nnTF {#3} {#1} { \clist_put_right:Nn \l__keys_options_clist {#2} } - { \clist_put_right:Nn \@unusedoptionlist {#1} } + { + \str_if_eq:eeF + { \exp_not:v { @raw@opt@ \@currname . \@currext } } + { \exp_not:V \@raw@classoptionslist } + { \clist_put_right:Nn \@unusedoptionlist {#1} } + } } -\cs_generate_variant:Nn \__keys_options_remove:nnn { e } \cs_new_protected:Npn \__keys_options_package:n #1 { - \clist_map_inline:Nn \@classoptionslist + \clist_map_inline:Nn \@raw@classoptionslist { - \__keys_options_remove:enn + \exp_args:Ne \__keys_options_package:nnn { \__keys_remove_equals:n {##1} } {##1} {#1} } } +\cs_new_protected:Npn \__keys_options_package:nnn #1#2#3 + { + \keys_if_exist:nnT {#3} {#1} + { + \clist_put_right:Nn \l__keys_options_clist {#2} + \clist_remove_all:Nn \@unusedoptionlist {#1} + } + } \cs_new_protected:Npn \__keys_options_local: { \cs_if_eq:NNF \@currext \@clsextension { - \cs_if_exist:cT { opt@ \@currname . \@currext } + \cs_if_exist:cT { @raw@opt@ \@currname . \@currext } { \clist_put_right:Nv \l__keys_options_clist - { opt@ \@currname . \@currext } + { @raw@opt@ \@currname . \@currext } } } } @@ -17115,28 +17138,22 @@ Type H <return> for immediate help.}% \lccode`\^^[=`\^^[ % oe in OT1 \fi % End of reset block for 8-bit engines \ExplSyntaxOn -\protected\def\@expl@text@lowercase@@n{\text_lowercase:n} -\protected\def\@expl@text@uppercase@@n{\text_uppercase:n} -\tl_put_right:Nn \l_text_case_exclude_arg_tl { \NoCaseChange } +\cs_new_protected_nopar:cpn{MakeUppercase~}{\text_uppercase:n} +\cs_set_nopar:Npx\MakeUppercase#1{\use:c{MakeUppercase~}{#1}} +\cs_new_protected_nopar:cpn{MakeLowercase~}{\text_lowercase:n} +\cs_set_nopar:Npx\MakeLowercase#1{\use:c{MakeLowercase~}{#1}} +\cs_new_protected_nopar:cpn{MakeTitlecase~}{\text_titlecase:n} +\cs_set_nopar:Npx\MakeTitlecase#1{\use:c{MakeTitlecase~}{#1}} +\cs_new_protected_nopar:Npn\AddToNoCaseChangeList + {\tl_put_right:Nn \l_text_case_exclude_arg_tl} +\AddToNoCaseChangeList{ \NoCaseChange } \cs_new_protected:Npn \NoCaseChange #1 {#1} +\cs_new_eq:NN \CaseSwitch \text_case_switch:nnnn +\cs_new_eq:NN \DeclareCaseChangeEquivalent + \text_declare_case_equivalent:Nn \ExplSyntaxOff -\DeclareRobustCommand{\MakeUppercase}[1]{{% - \def\i{I}\def\j{J}% - \def\reserved@a##1##2{\let##1##2\reserved@a}% - \expandafter\reserved@a\@uclclist\reserved@b{\reserved@b\@gobble}% - \protected@edef\reserved@a{\@expl@text@uppercase@@n{\noexpand\unexpanded{#1}}}% - \reserved@a - }} -\DeclareRobustCommand{\MakeLowercase}[1]{{% - \def\reserved@a##1##2{\let##2##1\reserved@a}% - \expandafter\reserved@a\@uclclist\reserved@b{\reserved@b\@gobble}% - \protected@edef\reserved@a{\@expl@text@lowercase@@n{\noexpand\unexpanded{#1}}}% - \reserved@a - }} \def\@uclclist{\oe\OE\o\O\ae\AE \dh\DH\dj\DJ\l\L\ng\NG\ss\SS\ij\IJ\th\TH} -\protected@edef\MakeUppercase#1{\MakeUppercase{#1}} -\protected@edef\MakeLowercase#1{\MakeLowercase{#1}} \let\reserved@a\@filelist \let\reserved@b=\@undefined \let\reserved@c=\@undefined diff --git a/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty index 3979ee773b4..33493b9bef5 100644 --- a/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty +++ b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty @@ -8120,6 +8120,27 @@ of this package available from CTAN} \ignorespaces} \EndIncludeInRelease +\IncludeInRelease{2021/11/15} + {\frozen@everydisplay}{Handle spaces after math}% +\frozen@everydisplay = {% + \aftergroup\@ignoretrue \aftergroup\ignorespaces + \check@mathfonts + \the\everydisplay} + +\frozen@everymath = {% + \aftergroup\@ignorefalse + \check@mathfonts + \the\everymath} +\EndIncludeInRelease +\IncludeInRelease{2020/10/01} + {\frozen@everydisplay}{Handle spaces after math}% + +\frozen@everydisplay = {\check@mathfonts + \the\everydisplay} +\frozen@everymath = {\check@mathfonts + \the\everymath} + +\EndIncludeInRelease \IncludeInRelease{2020/02/02}% {\LoadFontDefinitionFile}{Loading .fd files}% \def\LoadFontDefinitionFile#1#2{% @@ -9227,8 +9248,8 @@ of this package available from CTAN} (local:~ \int_use:N\c@localmathalphabets) } \cs_gset_eq:cc { mv@#1@frozen }{ mv@#1 } \tl_gset:cx { g__nfss_frozen_mv_ #1 _tl }{ \int_use:c { c@mv@#1 } } - \group_insert_after:N \__nfss_init_mv_freeze:N \exp_after:wN - \group_insert_after:N \cs:w mv@#1@reset \cs_end: + \group_insert_after:N \__nfss_init_mv_freeze:N + \exp_after:wN \group_insert_after:N \cs:w mv@#1@reset \cs_end: \tl_gput_right:No \check@mathfonts { \exp_after:wN \group_insert_after:N \cs:w mv@#1@reset \cs_end: @@ -9249,6 +9270,7 @@ of this package available from CTAN} { \@font@info{No~ math~ alphabet~ change~ to~ frozen~ version~ #1} } + \if@ignore \ignorespaces \fi } } \cs_new_protected:Npn \__nfss_init_mv_freeze:N #1 {% @@ -13966,7 +13988,9 @@ of this package available from CTAN} \@ifundefined{opt@fam@\@currname.\@currext} {\@onefilewithoptions@clashchk{#2}} {% - \@namedef{opt@\@currname.\@currext}{#2}% + \expandafter\edef\csname opt@\@currname.\@currext\endcsname + {\zap@space#2 \@empty}% + \@namedef{@raw@opt@\@currname.\@currext}{#2}% \expandafter\expandafter\expandafter\ProcessKeyOptions \expandafter\expandafter\expandafter [\csname opt@fam@\@currname.\@currext\endcsname]% diff --git a/Master/texmf-dist/tex/latex-dev/base/ltxdoc.cls b/Master/texmf-dist/tex/latex-dev/base/ltxdoc.cls index e66d2c91adf..dad98fadd09 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ltxdoc.cls +++ b/Master/texmf-dist/tex/latex-dev/base/ltxdoc.cls @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltxdoc} - [2022/06/14 v2.1g Standard LaTeX documentation class] + [2022/06/22 v2.1h Standard LaTeX documentation class] \DeclareOption{a5paper}{\@latexerr{Option not supported}% {}} \newif\ifltxdoc@load@cfg@ \ltxdoc@load@cfg@true @@ -79,7 +79,7 @@ \addtolength\oddsidemargin{20pt} \addtolength\evensidemargin{20pt} \setcounter{StandardModuleDepth}{1} -\def\cmd#1{\cs{\expandafter\cmd@to@cs\string#1}} +\def\cmd#1{\texttt{\char`\\\expandafter\cmd@to@cs\string#1}} \def\cmd@to@cs#1#2{\char\number`#2\relax} \providecommand\marg[1]{% {\ttfamily\char`\{}\meta{#1}{\ttfamily\char`\}}} diff --git a/Master/texmf-dist/tex/latex-dev/base/omlcmm.fd b/Master/texmf-dist/tex/latex-dev/base/omlcmm.fd index fcd7ac66daf..329e1cb193d 100644 --- a/Master/texmf-dist/tex/latex-dev/base/omlcmm.fd +++ b/Master/texmf-dist/tex/latex-dev/base/omlcmm.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{omlcmm.fd} - [2019/12/16 v2.5j Standard LaTeX font definitions] + [2022/07/10 v2.5l Standard LaTeX font definitions] \DeclareFontFamily{OML}{cmm}{\skewchar\font127 } \DeclareFontShape{OML}{cmm}{m}{it}% {<5><6><7><8><9>gen*cmmi% diff --git a/Master/texmf-dist/tex/latex-dev/base/omlcmr.fd b/Master/texmf-dist/tex/latex-dev/base/omlcmr.fd index e0fce9650ee..34a6edab171 100644 --- a/Master/texmf-dist/tex/latex-dev/base/omlcmr.fd +++ b/Master/texmf-dist/tex/latex-dev/base/omlcmr.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{omlcmr.fd} - [2019/12/16 v2.5j Standard LaTeX font definitions] + [2022/07/10 v2.5l Standard LaTeX font definitions] \DeclareFontFamily{OML}{cmr}{\skewchar\font127 } \DeclareFontShape{OML}{cmr}{m}{n}% {<->ssub*cmm/m/it}{} diff --git a/Master/texmf-dist/tex/latex-dev/base/omscmr.fd b/Master/texmf-dist/tex/latex-dev/base/omscmr.fd index c1a3b8a4924..35be157bd6b 100644 --- a/Master/texmf-dist/tex/latex-dev/base/omscmr.fd +++ b/Master/texmf-dist/tex/latex-dev/base/omscmr.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{omscmr.fd} - [2019/12/16 v2.5j Standard LaTeX font definitions] + [2022/07/10 v2.5l Standard LaTeX font definitions] \DeclareFontFamily{OMS}{cmr}{\skewchar\font48 } \DeclareFontShape{OMS}{cmr}{m}{n}% {<->ssub*cmsy/m/n}{} diff --git a/Master/texmf-dist/tex/latex-dev/base/omscmsy.fd b/Master/texmf-dist/tex/latex-dev/base/omscmsy.fd index 423f041e2f3..696a1cd9942 100644 --- a/Master/texmf-dist/tex/latex-dev/base/omscmsy.fd +++ b/Master/texmf-dist/tex/latex-dev/base/omscmsy.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{omscmsy.fd} - [2019/12/16 v2.5j Standard LaTeX font definitions] + [2022/07/10 v2.5l Standard LaTeX font definitions] \DeclareFontFamily{OMS}{cmsy}{\skewchar\font48 } \DeclareFontShape{OMS}{cmsy}{m}{n}{% <5><6><7><8><9><10>gen*cmsy% diff --git a/Master/texmf-dist/tex/latex-dev/base/omxcmex.fd b/Master/texmf-dist/tex/latex-dev/base/omxcmex.fd index dfd16bd3a4c..2f3fa1342fe 100644 --- a/Master/texmf-dist/tex/latex-dev/base/omxcmex.fd +++ b/Master/texmf-dist/tex/latex-dev/base/omxcmex.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{omxcmex.fd} - [2019/12/16 v2.5j Standard LaTeX font definitions] + [2022/07/10 v2.5l Standard LaTeX font definitions] \DeclareFontFamily{OMX}{cmex}{} \DeclareFontShape{OMX}{cmex}{m}{n}{% <->sfixed*cmex10% diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1cmdh.fd b/Master/texmf-dist/tex/latex-dev/base/ot1cmdh.fd index a34ae5c92e8..2ad840921f1 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ot1cmdh.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ot1cmdh.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{ot1cmdh.fd} - [2019/12/16 v2.5j Standard LaTeX font definitions] + [2022/07/10 v2.5l Standard LaTeX font definitions] \DeclareFontFamily{OT1}{cmdh}{\hyphenchar\font45 } \DeclareFontShape{OT1}{cmdh}{m}{n}{% <10>cmdunh10% diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1cmfib.fd b/Master/texmf-dist/tex/latex-dev/base/ot1cmfib.fd index e4ddbecd024..31a94988252 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ot1cmfib.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ot1cmfib.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{ot1cmfib.fd} - [2019/12/16 v2.5j Standard LaTeX font definitions] + [2022/07/10 v2.5l Standard LaTeX font definitions] \DeclareFontFamily{OT1}{cmfib}{\hyphenchar\font45 } \DeclareFontShape{OT1}{cmfib}{m}{n}{% <8>cmfib8% diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1cmfr.fd b/Master/texmf-dist/tex/latex-dev/base/ot1cmfr.fd index c1a5bf7bb02..378a07d8670 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ot1cmfr.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ot1cmfr.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{ot1cmfr.fd} - [2019/12/16 v2.5j Standard LaTeX font definitions] + [2022/07/10 v2.5l Standard LaTeX font definitions] \DeclareFontFamily{OT1}{cmfr}{\hyphenchar\font45 } \DeclareFontShape{OT1}{cmfr}{m}{n}{% <10>cmff10% diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1cmr.fd b/Master/texmf-dist/tex/latex-dev/base/ot1cmr.fd index 90c019feed5..a79e2b366f2 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ot1cmr.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ot1cmr.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{ot1cmr.fd} - [2019/12/16 v2.5j Standard LaTeX font definitions] + [2022/07/10 v2.5l Standard LaTeX font definitions] \DeclareFontFamily{OT1}{cmr}{\hyphenchar\font45 } \DeclareFontShape{OT1}{cmr}{m}{n}% {<5><6><7><8><9><10><12>gen*cmr% diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1cmss.fd b/Master/texmf-dist/tex/latex-dev/base/ot1cmss.fd index 7b98b6232f7..891c4f46c44 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ot1cmss.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ot1cmss.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{ot1cmss.fd} - [2019/12/16 v2.5j Standard LaTeX font definitions] + [2022/07/10 v2.5l Standard LaTeX font definitions] \DeclareFontFamily{OT1}{cmss}{\hyphenchar\font45 } \DeclareFontShape{OT1}{cmss}{m}{n} {% diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1cmtt.fd b/Master/texmf-dist/tex/latex-dev/base/ot1cmtt.fd index 2658d0a5319..02f080ce517 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ot1cmtt.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ot1cmtt.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{ot1cmtt.fd} - [2019/12/16 v2.5j Standard LaTeX font definitions] + [2022/07/10 v2.5l Standard LaTeX font definitions] \DeclareFontFamily{OT1}{cmtt}{\hyphenchar \font\m@ne} \DeclareFontShape{OT1}{cmtt}{m}{n} {% diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1cmvtt.fd b/Master/texmf-dist/tex/latex-dev/base/ot1cmvtt.fd index 0dd9bdd91a9..bf485c7e1d7 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ot1cmvtt.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ot1cmvtt.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{ot1cmvtt.fd} - [2019/12/16 v2.5j Standard LaTeX font definitions] + [2022/07/10 v2.5l Standard LaTeX font definitions] \DeclareFontFamily{OT1}{cmvtt}{\hyphenchar\font45 } \DeclareFontShape{OT1}{cmvtt}{m}{n}% {% diff --git a/Master/texmf-dist/tex/latex-dev/base/report.cls b/Master/texmf-dist/tex/latex-dev/base/report.cls index ac7d0f64793..2b2c29351d2 100644 --- a/Master/texmf-dist/tex/latex-dev/base/report.cls +++ b/Master/texmf-dist/tex/latex-dev/base/report.cls @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{report} - [2021/10/04 v1.4n + [2022/07/02 v1.4n Standard LaTeX document class] \newcommand\@ptsize{} \newif\if@restonecol diff --git a/Master/texmf-dist/tex/latex-dev/base/shortvrb.sty b/Master/texmf-dist/tex/latex-dev/base/shortvrb.sty index 4141d998138..9b4753ced92 100644 --- a/Master/texmf-dist/tex/latex-dev/base/shortvrb.sty +++ b/Master/texmf-dist/tex/latex-dev/base/shortvrb.sty @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesPackage{shortvrb} - [2022/06/08 v3.0j + [2022/07/03 v3.0k Standard LaTeX documentation package V3 (FMi)] %% %% Package `doc' to use with LaTeX 2e diff --git a/Master/texmf-dist/tex/latex-dev/base/size10.clo b/Master/texmf-dist/tex/latex-dev/base/size10.clo index 6f0c7561b20..03dc8e61fc5 100644 --- a/Master/texmf-dist/tex/latex-dev/base/size10.clo +++ b/Master/texmf-dist/tex/latex-dev/base/size10.clo @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{size10.clo} - [2021/10/04 v1.4n + [2022/07/02 v1.4n Standard LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xpt\@xiipt diff --git a/Master/texmf-dist/tex/latex-dev/base/size11.clo b/Master/texmf-dist/tex/latex-dev/base/size11.clo index 1ba265275ea..71f930d413d 100644 --- a/Master/texmf-dist/tex/latex-dev/base/size11.clo +++ b/Master/texmf-dist/tex/latex-dev/base/size11.clo @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{size11.clo} - [2021/10/04 v1.4n + [2022/07/02 v1.4n Standard LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xipt{13.6}% diff --git a/Master/texmf-dist/tex/latex-dev/base/size12.clo b/Master/texmf-dist/tex/latex-dev/base/size12.clo index c07477787c9..e85a5983c4c 100644 --- a/Master/texmf-dist/tex/latex-dev/base/size12.clo +++ b/Master/texmf-dist/tex/latex-dev/base/size12.clo @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{size12.clo} - [2021/10/04 v1.4n + [2022/07/02 v1.4n Standard LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xiipt{14.5}% diff --git a/Master/texmf-dist/tex/latex-dev/base/t1cmdh.fd b/Master/texmf-dist/tex/latex-dev/base/t1cmdh.fd index 2855ca8a1f9..780a713ce9b 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t1cmdh.fd +++ b/Master/texmf-dist/tex/latex-dev/base/t1cmdh.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{t1cmdh.fd} - [2019/12/16 v2.5j Standard LaTeX font definitions] + [2022/07/10 v2.5l Standard LaTeX font definitions] \providecommand{\EC@family}[5]{% \DeclareFontShape{#1}{#2}{#3}{#4}% {<5><6><7><8><9><10><10.95><12><14.4>% diff --git a/Master/texmf-dist/tex/latex-dev/base/t1cmfib.fd b/Master/texmf-dist/tex/latex-dev/base/t1cmfib.fd index 63db02be391..c2f39ac5212 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t1cmfib.fd +++ b/Master/texmf-dist/tex/latex-dev/base/t1cmfib.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{t1cmfib.fd} - [2019/12/16 v2.5j Standard LaTeX font definitions] + [2022/07/10 v2.5l Standard LaTeX font definitions] \providecommand{\EC@family}[5]{% \DeclareFontShape{#1}{#2}{#3}{#4}% {<5><6><7><8><9><10><10.95><12><14.4>% diff --git a/Master/texmf-dist/tex/latex-dev/base/t1cmfr.fd b/Master/texmf-dist/tex/latex-dev/base/t1cmfr.fd index d71ca32c4c8..ec37c5faf36 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t1cmfr.fd +++ b/Master/texmf-dist/tex/latex-dev/base/t1cmfr.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{t1cmfr.fd} - [2019/12/16 v2.5j Standard LaTeX font definitions] + [2022/07/10 v2.5l Standard LaTeX font definitions] \providecommand{\EC@family}[5]{% \DeclareFontShape{#1}{#2}{#3}{#4}% {<5><6><7><8><9><10><10.95><12><14.4>% diff --git a/Master/texmf-dist/tex/latex-dev/base/t1cmr.fd b/Master/texmf-dist/tex/latex-dev/base/t1cmr.fd index ff17222f16f..04c86917c23 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t1cmr.fd +++ b/Master/texmf-dist/tex/latex-dev/base/t1cmr.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{t1cmr.fd} - [2019/12/16 v2.5j Standard LaTeX font definitions] + [2022/07/10 v2.5l Standard LaTeX font definitions] \providecommand{\EC@family}[5]{% \DeclareFontShape{#1}{#2}{#3}{#4}% {<5><6><7><8><9><10><10.95><12><14.4>% @@ -62,6 +62,9 @@ \EC@family{T1}{cmr}{bx}{sl}{ecbl} \EC@family{T1}{cmr}{bx}{sc}{ecxc} \EC@family{T1}{cmr}{m}{ui}{ecui} +\EC@family{T1}{cmr}{m}{scsl}{ecsc} +\EC@family{T1}{cmr}{bx}{scsl}{ecoc} +\EC@family{T1}{cmr}{b}{scsl}{ecoc} \endinput %% %% End of file `t1cmr.fd'. diff --git a/Master/texmf-dist/tex/latex-dev/base/t1cmss.fd b/Master/texmf-dist/tex/latex-dev/base/t1cmss.fd index 5dc6c724b0c..1f7138b51b7 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t1cmss.fd +++ b/Master/texmf-dist/tex/latex-dev/base/t1cmss.fd @@ -46,18 +46,18 @@ %% making successful document exchange impossible. %% \ProvidesFile{t1cmss.fd} - [2019/12/16 v2.5j Standard LaTeX font definitions] -\providecommand{\EC@family}[5]{% + [2022/07/10 v2.5l Standard LaTeX font definitions] +\providecommand{\EC@ssfamily}[5]{% \DeclareFontShape{#1}{#2}{#3}{#4}% - {<5><6><7><8><9><10><10.95><12><14.4>% - <17.28><20.74><24.88><29.86><35.83>genb*#5}{}} + {<5><6><7><8>#50800% + <9><10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83>genb*#5}{}} \DeclareFontFamily{T1}{cmss}{} -\EC@family{T1}{cmss}{m}{n}{ecss} -\EC@family{T1}{cmss}{m}{sl}{ecsi} -\EC@family{T1}{cmss}{m}{it}{ecsi} -\EC@family{T1}{cmss}{bx}{n}{ecsx} -\EC@family{T1}{cmss}{bx}{it}{ecso} -\EC@family{T1}{cmss}{bx}{sl}{ecso} +\EC@ssfamily{T1}{cmss}{m}{n}{ecss} +\EC@ssfamily{T1}{cmss}{m}{sl}{ecsi} +\EC@ssfamily{T1}{cmss}{m}{it}{ecsi} +\EC@ssfamily{T1}{cmss}{bx}{n}{ecsx} +\EC@ssfamily{T1}{cmss}{bx}{it}{ecso} +\EC@ssfamily{T1}{cmss}{bx}{sl}{ecso} %%%%%% Font/shape undefined, therefore substituted \DeclareFontShape{T1}{cmss}{m}{sc}% {<->sub*cmr/m/sc}{} diff --git a/Master/texmf-dist/tex/latex-dev/base/t1cmtt.fd b/Master/texmf-dist/tex/latex-dev/base/t1cmtt.fd index 8ef2377d9f8..3cb4e498c51 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t1cmtt.fd +++ b/Master/texmf-dist/tex/latex-dev/base/t1cmtt.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{t1cmtt.fd} - [2019/12/16 v2.5j Standard LaTeX font definitions] + [2022/07/10 v2.5l Standard LaTeX font definitions] \providecommand{\EC@ttfamily}[5]{% \DeclareFontShape{#1}{#2}{#3}{#4}% {<5><6><7><8>#50800% diff --git a/Master/texmf-dist/tex/latex-dev/base/t1cmvtt.fd b/Master/texmf-dist/tex/latex-dev/base/t1cmvtt.fd index d31fe4202bc..bd33c77b7fd 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t1cmvtt.fd +++ b/Master/texmf-dist/tex/latex-dev/base/t1cmvtt.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{t1cmvtt.fd} - [2019/12/16 v2.5j Standard LaTeX font definitions] + [2022/07/10 v2.5l Standard LaTeX font definitions] \providecommand{\EC@ttfamily}[5]{% \DeclareFontShape{#1}{#2}{#3}{#4}% {<5><6><7><8>#50800% diff --git a/Master/texmf-dist/tex/latex-dev/base/ts1cmr.fd b/Master/texmf-dist/tex/latex-dev/base/ts1cmr.fd index b3e92d27237..62e7610e4a8 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ts1cmr.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ts1cmr.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{ts1cmr.fd} - [2019/12/16 v2.5j Standard LaTeX font definitions] + [2022/07/10 v2.5l Standard LaTeX font definitions] \providecommand{\EC@family}[5]{% \DeclareFontShape{#1}{#2}{#3}{#4}% {<5><6><7><8><9><10><10.95><12><14.4>% diff --git a/Master/texmf-dist/tex/latex-dev/base/ts1cmss.fd b/Master/texmf-dist/tex/latex-dev/base/ts1cmss.fd index 2ca7eae58c2..88329e97559 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ts1cmss.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ts1cmss.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{ts1cmss.fd} - [2019/12/16 v2.5j Standard LaTeX font definitions] + [2022/07/10 v2.5l Standard LaTeX font definitions] \providecommand{\EC@family}[5]{% \DeclareFontShape{#1}{#2}{#3}{#4}% {<5><6><7><8><9><10><10.95><12><14.4>% diff --git a/Master/texmf-dist/tex/latex-dev/base/ts1cmtt.fd b/Master/texmf-dist/tex/latex-dev/base/ts1cmtt.fd index 2947b13e1a3..bbea6182516 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ts1cmtt.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ts1cmtt.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{ts1cmtt.fd} - [2019/12/16 v2.5j Standard LaTeX font definitions] + [2022/07/10 v2.5l Standard LaTeX font definitions] \providecommand{\EC@ttfamily}[5]{% \DeclareFontShape{#1}{#2}{#3}{#4}% {<5><6><7><8>#50800% diff --git a/Master/texmf-dist/tex/latex-dev/base/ts1cmvtt.fd b/Master/texmf-dist/tex/latex-dev/base/ts1cmvtt.fd index c4a96cfc2b2..33e6ede3271 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ts1cmvtt.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ts1cmvtt.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{ts1cmvtt.fd} - [2019/12/16 v2.5j Standard LaTeX font definitions] + [2022/07/10 v2.5l Standard LaTeX font definitions] \providecommand{\EC@ttfamily}[5]{% \DeclareFontShape{#1}{#2}{#3}{#4}% {<5><6><7><8>#50800% diff --git a/Master/texmf-dist/tex/latex-dev/base/ucmr.fd b/Master/texmf-dist/tex/latex-dev/base/ucmr.fd index e795726253a..7ab1d923a2a 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ucmr.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ucmr.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{ucmr.fd} - [2019/12/16 v2.5j Standard LaTeX font definitions] + [2022/07/10 v2.5l Standard LaTeX font definitions] \DeclareFontFamily{U}{cmr}{\hyphenchar\font45 } \DeclareFontShape{U}{cmr}{m}{n}% {<5><6><7><8><9><10><12>gen*cmr% diff --git a/Master/texmf-dist/tex/latex-dev/base/ucmss.fd b/Master/texmf-dist/tex/latex-dev/base/ucmss.fd index 60bbff556ee..963b6316c86 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ucmss.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ucmss.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{ucmss.fd} - [2019/12/16 v2.5j Standard LaTeX font definitions] + [2022/07/10 v2.5l Standard LaTeX font definitions] \DeclareFontFamily{U}{cmss}{\hyphenchar\font45 } \DeclareFontShape{U}{cmss}{m}{n}% {% diff --git a/Master/texmf-dist/tex/latex-dev/base/ucmtt.fd b/Master/texmf-dist/tex/latex-dev/base/ucmtt.fd index fdf09d32a07..5fa40718388 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ucmtt.fd +++ b/Master/texmf-dist/tex/latex-dev/base/ucmtt.fd @@ -46,7 +46,7 @@ %% making successful document exchange impossible. %% \ProvidesFile{ucmtt.fd} - [2019/12/16 v2.5j Standard LaTeX font definitions] + [2022/07/10 v2.5l Standard LaTeX font definitions] \DeclareFontFamily{U}{cmtt}{\hyphenchar \font\m@ne} \DeclareFontShape{U}{cmtt}{m}{n}% {% |