From f87ea7533e16b8b8a7f8b0348e15b34e0dcba81e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 29 Jul 2022 21:00:22 +0000 Subject: memoir (28jul22) git-svn-id: svn://tug.org/texlive/trunk@64001 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/memoir/mem10.clo | 27 ++++++++++++++----------- Master/texmf-dist/tex/latex/memoir/mem11.clo | 27 ++++++++++++++----------- Master/texmf-dist/tex/latex/memoir/mem12.clo | 27 ++++++++++++++----------- Master/texmf-dist/tex/latex/memoir/mem14.clo | 27 ++++++++++++++----------- Master/texmf-dist/tex/latex/memoir/mem17.clo | 27 ++++++++++++++----------- Master/texmf-dist/tex/latex/memoir/mem20.clo | 27 ++++++++++++++----------- Master/texmf-dist/tex/latex/memoir/mem25.clo | 27 ++++++++++++++----------- Master/texmf-dist/tex/latex/memoir/mem30.clo | 27 ++++++++++++++----------- Master/texmf-dist/tex/latex/memoir/mem36.clo | 27 ++++++++++++++----------- Master/texmf-dist/tex/latex/memoir/mem48.clo | 27 ++++++++++++++----------- Master/texmf-dist/tex/latex/memoir/mem60.clo | 27 ++++++++++++++----------- Master/texmf-dist/tex/latex/memoir/mem9.clo | 29 +++++++++++++++------------ Master/texmf-dist/tex/latex/memoir/memoir.cls | 20 +++++++++++------- 13 files changed, 194 insertions(+), 152 deletions(-) (limited to 'Master/texmf-dist/tex/latex/memoir') diff --git a/Master/texmf-dist/tex/latex/memoir/mem10.clo b/Master/texmf-dist/tex/latex/memoir/mem10.clo index a12f85bbfc1..8aea257e666 100644 --- a/Master/texmf-dist/tex/latex/memoir/mem10.clo +++ b/Master/texmf-dist/tex/latex/memoir/mem10.clo @@ -27,7 +27,7 @@ %% This work consists of the files listed in the README file. %% \ProvidesFile{mem10.clo}% - [2008/01/30 v0.3 memoir class 10pt size option] + [2022/07/29 v0.5 memoir class 10pt size option] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt\@xiipt \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@ @@ -36,7 +36,10 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\newcommand{\small}{% +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi +\DeclareRobustCommand{\small}{% \@setfontsize\small\@ixpt{11}% \abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@ \abovedisplayshortskip \z@ \@plus2\p@ @@ -49,7 +52,7 @@ }% \belowdisplayskip \abovedisplayskip } -\newcommand{\footnotesize}{% +\DeclareRobustCommand{\footnotesize}{% \@setfontsize\footnotesize\@viiipt{9.5}% \abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@ \abovedisplayshortskip \z@ \@plus\p@ @@ -62,15 +65,15 @@ }% \belowdisplayskip \abovedisplayskip } -\newcommand*{\miniscule}{\@setfontsize\miniscule\@vpt{6}} -\newcommand*{\tiny}{\@setfontsize\tiny\@vipt{7}} -\newcommand*{\scriptsize}{\@setfontsize\scriptsize\@viipt{8}} -\newcommand*{\large}{\@setfontsize\large\@xipt{13.6}} -\newcommand*{\Large}{\@setfontsize\Large\@xiipt{14.5}} -\newcommand*{\LARGE}{\@setfontsize\LARGE\@xivpt{18}} -\newcommand*{\huge}{\@setfontsize\huge\@xviipt{22}} -\newcommand*{\Huge}{\@setfontsize\Huge\@xxpt{25}} -\newcommand*{\HUGE}{\@setfontsize\HUGE\@xxvpt{30}} +\DeclareRobustCommand{\miniscule}{\@setfontsize\miniscule\@vpt{6}} +\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt{7}} +\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viipt{8}} +\DeclareRobustCommand{\large}{\@setfontsize\large\@xipt{13.6}} +\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xiipt{14.5}} +\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xivpt{18}} +\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xviipt{22}} +\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxpt{25}} +\DeclareRobustCommand{\HUGE}{\@setfontsize\HUGE\@xxvpt{30}} \setlength{\onelineskip}{\@xiipt\p@} \if@twocolumn \setlength\parindent{1em} diff --git a/Master/texmf-dist/tex/latex/memoir/mem11.clo b/Master/texmf-dist/tex/latex/memoir/mem11.clo index 784e2a015ae..68ec3ee5ca3 100644 --- a/Master/texmf-dist/tex/latex/memoir/mem11.clo +++ b/Master/texmf-dist/tex/latex/memoir/mem11.clo @@ -27,7 +27,7 @@ %% This work consists of the files listed in the README file. %% \ProvidesFile{mem11.clo}% - [2008/01/30 v0.3 memoir class 11pt size option] + [2022/07/29 v0.5 memoir class 11pt size option] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{13.6}% \abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@ @@ -36,7 +36,10 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\newcommand{\small}{% +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi +\DeclareRobustCommand{\small}{% \@setfontsize\small\@xpt\@xiipt \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@ \abovedisplayshortskip \z@ \@plus3\p@ @@ -49,7 +52,7 @@ }% \belowdisplayskip \abovedisplayskip } -\newcommand{\footnotesize}{% +\DeclareRobustCommand{\footnotesize}{% \@setfontsize\footnotesize\@ixpt{11}% \abovedisplayskip 8\p@ \@plus2\p@ \@minus4\p@ \abovedisplayshortskip \z@ \@plus\p@ @@ -62,16 +65,16 @@ }% \belowdisplayskip \abovedisplayskip } -\newcommand*{\miniscule}{\@setfontsize\miniscule\@vipt{7}} -\newcommand*{\tiny}{\@setfontsize\tiny\@viipt{8}} -\newcommand*{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}} -\newcommand*{\large}{\@setfontsize\large\@xiipt{14.5}} -\newcommand*{\Large}{\@setfontsize\Large\@xivpt{18}} -\newcommand*{\LARGE}{\@setfontsize\LARGE\@xviipt{22}} -\newcommand*{\huge}{\@setfontsize\huge\@xxpt{25}} -\newcommand*{\Huge}{\@setfontsize\Huge\@xxvpt{30}} +\DeclareRobustCommand{\miniscule}{\@setfontsize\miniscule\@vipt{7}} +\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@viipt{8}} +\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}} +\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{14.5}} +\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{18}} +\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{22}} +\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{25}} +\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{30}} \ifextrafontsizes - \newcommand*{\HUGE}{\@setfontsize\HUGE\@xxxpt{37}} + \DeclareRobustCommand{\HUGE}{\@setfontsize\HUGE\@xxxpt{37}} \else \let\HUGE=\Huge \fi diff --git a/Master/texmf-dist/tex/latex/memoir/mem12.clo b/Master/texmf-dist/tex/latex/memoir/mem12.clo index 7d640e09e82..580fac2e52d 100644 --- a/Master/texmf-dist/tex/latex/memoir/mem12.clo +++ b/Master/texmf-dist/tex/latex/memoir/mem12.clo @@ -27,7 +27,7 @@ %% This work consists of the files listed in the README file. %% \ProvidesFile{mem12.clo}% - [2010/10/19 v0.4b memoir class 12pt size option] + [2022/07/29 v0.5 memoir class 12pt size option] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{14.5}% \abovedisplayskip 12\p@ \@plus3\p@ \@minus7\p@ @@ -36,7 +36,10 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\newcommand{\small}{% +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi +\DeclareRobustCommand{\small}{% \@setfontsize\small\@xipt{13.6}% \abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@ \abovedisplayshortskip \z@ \@plus3\p@ @@ -49,7 +52,7 @@ }% \belowdisplayskip \abovedisplayskip } -\newcommand{\footnotesize}{% +\DeclareRobustCommand{\footnotesize}{% \@setfontsize\footnotesize\@xpt\@xiipt \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@ \abovedisplayshortskip \z@ \@plus3\p@ @@ -62,16 +65,16 @@ }% \belowdisplayskip \abovedisplayskip } -\newcommand*{\miniscule}{\@setfontsize\miniscule\@viipt{8}} -\newcommand*{\tiny}{\@setfontsize\tiny\@viiipt{9.5}} -\newcommand*{\scriptsize}{\@setfontsize\scriptsize\@ixpt\@xpt} -\newcommand*{\large}{\@setfontsize\large\@xivpt{18}} -\newcommand*{\Large}{\@setfontsize\Large\@xviipt{22}} -\newcommand*{\LARGE}{\@setfontsize\LARGE\@xxpt{25}} -\newcommand*{\huge}{\@setfontsize\huge\@xxvpt{30}} +\DeclareRobustCommand{\miniscule}{\@setfontsize\miniscule\@viipt{8}} +\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@viiipt{9.5}} +\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@ixpt\@xpt} +\DeclareRobustCommand{\large}{\@setfontsize\large\@xivpt{18}} +\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xviipt{22}} +\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xxpt{25}} +\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxvpt{30}} \ifextrafontsizes - \newcommand*{\Huge}{\@setfontsize\Huge\@xxxpt{37}} - \newcommand*{\HUGE}{\@setfontsize\HUGE\@xxxvipt{45}} + \DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxxpt{37}} + \DeclareRobustCommand{\HUGE}{\@setfontsize\HUGE\@xxxvipt{45}} \else \let\Huge=\huge \let\HUGE=\huge diff --git a/Master/texmf-dist/tex/latex/memoir/mem14.clo b/Master/texmf-dist/tex/latex/memoir/mem14.clo index 03c64fe20fa..b8dba4ae94c 100644 --- a/Master/texmf-dist/tex/latex/memoir/mem14.clo +++ b/Master/texmf-dist/tex/latex/memoir/mem14.clo @@ -27,7 +27,7 @@ %% This work consists of the files listed in the README file. %% \ProvidesFile{mem14.clo}% - [2008/01/30 v0.4 memoir class 14pt size option] + [2022/07/29 v0.5 memoir class 14pt size option] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xivpt{17.5}% \abovedisplayskip 14\p@ \@plus3\p@ \@minus8\p@ @@ -36,7 +36,10 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\newcommand{\small}{% +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi +\DeclareRobustCommand{\small}{% \@setfontsize\small\@xiipt{14.5}% \abovedisplayskip 12\p@ \@plus3\p@ \@minus7\p@ \abovedisplayshortskip \z@ \@plus3\p@ @@ -49,7 +52,7 @@ }% \belowdisplayskip \abovedisplayskip } -\newcommand{\footnotesize}{% +\DeclareRobustCommand{\footnotesize}{% \@setfontsize\footnotesize\@xipt{13.6}% \abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@ \abovedisplayshortskip \z@ \@plus3\p@ @@ -62,16 +65,16 @@ }% \belowdisplayskip \abovedisplayskip } -\newcommand*{\miniscule}{\@setfontsize\miniscule\@viiipt{9.5}} -\newcommand*{\tiny}{\@setfontsize\tiny\@ixpt{10}} -\newcommand*{\scriptsize}{\@setfontsize\scriptsize\@xpt{12}} -\newcommand*{\large}{\@setfontsize\large\@xviipt{22}} -\newcommand*{\Large}{\@setfontsize\Large\@xxpt{25}} -\newcommand*{\LARGE}{\@setfontsize\LARGE\@xxvpt{30}} +\DeclareRobustCommand{\miniscule}{\@setfontsize\miniscule\@viiipt{9.5}} +\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@ixpt{10}} +\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@xpt{12}} +\DeclareRobustCommand{\large}{\@setfontsize\large\@xviipt{22}} +\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xxpt{25}} +\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xxvpt{30}} \ifextrafontsizes - \newcommand*{\huge}{\@setfontsize\Huge\@xxxpt{37}} - \newcommand*{\Huge}{\@setfontsize\Huge\@xxxvipt{45}} - \newcommand*{\HUGE}{\@setfontsize\HUGE\@xlviiipt{60}} + \DeclareRobustCommand{\huge}{\@setfontsize\Huge\@xxxpt{37}} + \DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxxvipt{45}} + \DeclareRobustCommand{\HUGE}{\@setfontsize\HUGE\@xlviiipt{60}} \else \let\huge=\LARGE \let\Huge=\LARGE diff --git a/Master/texmf-dist/tex/latex/memoir/mem17.clo b/Master/texmf-dist/tex/latex/memoir/mem17.clo index 7480b783780..f2dbda2af04 100644 --- a/Master/texmf-dist/tex/latex/memoir/mem17.clo +++ b/Master/texmf-dist/tex/latex/memoir/mem17.clo @@ -27,7 +27,7 @@ %% This work consists of the files listed in the README file. %% \ProvidesFile{mem17.clo}% - [2008/01/30 v0.3 memoir class 17pt size option] + [2022/07/29 v0.5 memoir class 17pt size option] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xviipt{22}% \abovedisplayskip 15\p@ \@plus4\p@ \@minus8\p@ @@ -36,7 +36,10 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\newcommand{\small}{% +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi +\DeclareRobustCommand{\small}{% \@setfontsize\small\@xivpt{17}% \abovedisplayskip 12\p@ \@plus3\p@ \@minus7\p@ \abovedisplayshortskip \z@ \@plus3\p@ @@ -49,7 +52,7 @@ }% \belowdisplayskip \abovedisplayskip } -\newcommand{\footnotesize}{% +\DeclareRobustCommand{\footnotesize}{% \@setfontsize\footnotesize\@xiipt{14}% \abovedisplayskip 12\p@ \@plus3\p@ \@minus7\p@ \abovedisplayshortskip \z@ \@plus3\p@ @@ -62,16 +65,16 @@ }% \belowdisplayskip \abovedisplayskip } -\newcommand*{\miniscule}{\@setfontsize\miniscule\@ixpt{10}} -\newcommand*{\tiny}{\@setfontsize\tiny\@xpt{12}} -\newcommand*{\scriptsize}{\@setfontsize\scriptsize\@xipt{13.6}} -\newcommand*{\large}{\@setfontsize\large\@xxpt{25}} -\newcommand*{\Large}{\@setfontsize\Large\@xxvpt{30}} +\DeclareRobustCommand{\miniscule}{\@setfontsize\miniscule\@ixpt{10}} +\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@xpt{12}} +\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@xipt{13.6}} +\DeclareRobustCommand{\large}{\@setfontsize\large\@xxpt{25}} +\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xxvpt{30}} \ifextrafontsizes - \newcommand*{\LARGE}{\@setfontsize\LARGE\@xxxpt{37}} - \newcommand*{\huge}{\@setfontsize\huge\@xxxvipt{45}} - \newcommand*{\Huge}{\@setfontsize\Huge\@xlviiipt{60}} - \newcommand*{\HUGE}{\@setfontsize\HUGE\@lxpt{72}} + \DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xxxpt{37}} + \DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxxvipt{45}} + \DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xlviiipt{60}} + \DeclareRobustCommand{\HUGE}{\@setfontsize\HUGE\@lxpt{72}} \else \let\LARGE=\Large \let\huge=\Large diff --git a/Master/texmf-dist/tex/latex/memoir/mem20.clo b/Master/texmf-dist/tex/latex/memoir/mem20.clo index 76c0c71c0b2..757428f1754 100644 --- a/Master/texmf-dist/tex/latex/memoir/mem20.clo +++ b/Master/texmf-dist/tex/latex/memoir/mem20.clo @@ -27,7 +27,7 @@ %% This work consists of the files listed in the README file. %% \ProvidesFile{mem20.clo}% - [2008/01/31 v0.1 memoir class 20pt size option] + [2022/07/29 v0.5 memoir class 20pt size option] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xxpt{25}% \abovedisplayskip 20\p@ \@plus5\p@ \@minus9\p@ @@ -36,7 +36,10 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\newcommand{\small}{% +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi +\DeclareRobustCommand{\small}{% \@setfontsize\small\@xviipt{22}% \abovedisplayskip 17\p@ \@plus4\p@ \@minus8\p@ \abovedisplayshortskip \z@ \@plus4\p@ @@ -47,7 +50,7 @@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip } -\newcommand{\footnotesize}{% +\DeclareRobustCommand{\footnotesize}{% \@setfontsize\footnotesize\@xivpt{17.5}% \abovedisplayskip 14\p@ \@plus3\p@ \@minus8\p@ \abovedisplayshortskip \z@ \@plus3\p@ @@ -58,15 +61,15 @@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip } -\newcommand*{\miniscule}{\@setfontsize\miniscule\@xpt{12}} -\newcommand*{\tiny}{\@setfontsize\tiny\@xipt{13.6}} -\newcommand*{\scriptsize}{\@setfontsize\scriptsize\@xiipt{14.5}} -\newcommand*{\large}{\@setfontsize\large\@xxvpt{30}} -\newcommand*{\Large}{\@setfontsize\Large\@xxxpt{37}} -\newcommand*{\LARGE}{\@setfontsize\LARGE\@xxxvipt{45}} -\newcommand*{\huge}{\@setfontsize\huge\@xlviiipt{60}} -\newcommand*{\Huge}{\@setfontsize\Huge\@lxpt{72}} -\newcommand*{\HUGE}{\@setfontsize\HUGE\@lxxiipt{86}} +\DeclareRobustCommand{\miniscule}{\@setfontsize\miniscule\@xpt{12}} +\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@xipt{13.6}} +\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@xiipt{14.5}} +\DeclareRobustCommand{\large}{\@setfontsize\large\@xxvpt{30}} +\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xxxpt{37}} +\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xxxvipt{45}} +\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xlviiipt{60}} +\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@lxpt{72}} +\DeclareRobustCommand{\HUGE}{\@setfontsize\HUGE\@lxxiipt{86}} \setlength{\onelineskip}{25\p@} \if@twocolumn \setlength\parindent{1em} diff --git a/Master/texmf-dist/tex/latex/memoir/mem25.clo b/Master/texmf-dist/tex/latex/memoir/mem25.clo index 663ff6eb5f5..19a3bbf474a 100644 --- a/Master/texmf-dist/tex/latex/memoir/mem25.clo +++ b/Master/texmf-dist/tex/latex/memoir/mem25.clo @@ -27,7 +27,7 @@ %% This work consists of the files listed in the README file. %% \ProvidesFile{mem25.clo}% - [2008/01/31 v0.1 memoir class 25pt size option] + [2022/07/29 v0.5 memoir class 25pt size option] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xxvpt{30}% \abovedisplayskip 25\p@ \@plus6\p@ \@minus10\p@ @@ -36,7 +36,10 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\newcommand{\small}{% +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi +\DeclareRobustCommand{\small}{% \@setfontsize\small\@xxpt{25}% \abovedisplayskip 20\p@ \@plus5\p@ \@minus9\p@ \abovedisplayshortskip \z@ \@plus5\p@ @@ -47,7 +50,7 @@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip } -\newcommand{\footnotesize}{% +\DeclareRobustCommand{\footnotesize}{% \@setfontsize\footnotesize\@xviipt{22}% \abovedisplayskip 17\p@ \@plus4\p@ \@minus8\p@ \abovedisplayshortskip \z@ \@plus4\p@ @@ -58,15 +61,15 @@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip } -\newcommand*{\miniscule}{\@setfontsize\miniscule\@xipt{13.6}} -\newcommand*{\tiny}{\@setfontsize\tiny\@xiipt{14.5}} -\newcommand*{\scriptsize}{\@setfontsize\scriptsize\@xivpt{17.5}} -\newcommand*{\large}{\@setfontsize\large\@xxxpt{37}} -\newcommand*{\Large}{\@setfontsize\Large\@xxxvipt{45}} -\newcommand*{\LARGE}{\@setfontsize\LARGE\@xlviiipt{60}} -\newcommand*{\huge}{\@setfontsize\huge\@lxpt{72}} -\newcommand*{\Huge}{\@setfontsize\Huge\@lxxiipt{86}} -\newcommand*{\HUGE}{\@setfontsize\HUGE\@lxxxivpt{100}} +\DeclareRobustCommand{\miniscule}{\@setfontsize\miniscule\@xipt{13.6}} +\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@xiipt{14.5}} +\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@xivpt{17.5}} +\DeclareRobustCommand{\large}{\@setfontsize\large\@xxxpt{37}} +\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xxxvipt{45}} +\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xlviiipt{60}} +\DeclareRobustCommand{\huge}{\@setfontsize\huge\@lxpt{72}} +\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@lxxiipt{86}} +\DeclareRobustCommand{\HUGE}{\@setfontsize\HUGE\@lxxxivpt{100}} \setlength{\onelineskip}{30\p@} \if@twocolumn \setlength\parindent{1em} diff --git a/Master/texmf-dist/tex/latex/memoir/mem30.clo b/Master/texmf-dist/tex/latex/memoir/mem30.clo index ed911232e44..269f28ae034 100644 --- a/Master/texmf-dist/tex/latex/memoir/mem30.clo +++ b/Master/texmf-dist/tex/latex/memoir/mem30.clo @@ -27,7 +27,7 @@ %% This work consists of the files listed in the README file. %% \ProvidesFile{mem30.clo}% - [2008/01/31 v0.1 memoir class 30pt size option] + [2022/07/29 v0.5 memoir class 30pt size option] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xxxpt{37}% \abovedisplayskip 30\p@ \@plus7\p@ \@minus11\p@ @@ -36,7 +36,10 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\newcommand{\small}{% +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi +\DeclareRobustCommand{\small}{% \@setfontsize\small\@xxvpt{30}% \abovedisplayskip 25\p@ \@plus6\p@ \@minus10\p@ \abovedisplayshortskip \z@ \@plus6\p@ @@ -47,7 +50,7 @@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip } -\newcommand{\footnotesize}{% +\DeclareRobustCommand{\footnotesize}{% \@setfontsize\footnotesize\@xxpt{25}% \abovedisplayskip 20\p@ \@plus5\p@ \@minus9\p@ \abovedisplayshortskip \z@ \@plus5\p@ @@ -58,15 +61,15 @@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip } -\newcommand*{\miniscule}{\@setfontsize\miniscule\@xiipt{14.5}} -\newcommand*{\tiny}{\@setfontsize\tiny\@xivpt{17.5}} -\newcommand*{\scriptsize}{\@setfontsize\scriptsize\@xviipt{22}} -\newcommand*{\large}{\@setfontsize\large\@xxxvipt{45}} -\newcommand*{\Large}{\@setfontsize\Large\@xlviiipt{60}} -\newcommand*{\LARGE}{\@setfontsize\LARGE\@lxpt{72}} -\newcommand*{\huge}{\@setfontsize\huge\@lxxiipt{86}} -\newcommand*{\Huge}{\@setfontsize\Huge\@lxxxivpt{100}} -\newcommand*{\HUGE}{\@setfontsize\HUGE\@xcvipt{116}} +\DeclareRobustCommand{\miniscule}{\@setfontsize\miniscule\@xiipt{14.5}} +\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@xivpt{17.5}} +\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@xviipt{22}} +\DeclareRobustCommand{\large}{\@setfontsize\large\@xxxvipt{45}} +\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xlviiipt{60}} +\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@lxpt{72}} +\DeclareRobustCommand{\huge}{\@setfontsize\huge\@lxxiipt{86}} +\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@lxxxivpt{100}} +\DeclareRobustCommand{\HUGE}{\@setfontsize\HUGE\@xcvipt{116}} \setlength{\onelineskip}{37\p@} \if@twocolumn \setlength\parindent{1em} diff --git a/Master/texmf-dist/tex/latex/memoir/mem36.clo b/Master/texmf-dist/tex/latex/memoir/mem36.clo index 42e5f4c461d..ce86a59926b 100644 --- a/Master/texmf-dist/tex/latex/memoir/mem36.clo +++ b/Master/texmf-dist/tex/latex/memoir/mem36.clo @@ -27,7 +27,7 @@ %% This work consists of the files listed in the README file. %% \ProvidesFile{mem36.clo}% - [2008/01/31 v0.1 memoir class 36pt size option] + [2022/07/29 v0.5 memoir class 36pt size option] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xxxvipt{45}% \abovedisplayskip 36\p@ \@plus8\p@ \@minus12\p@ @@ -36,7 +36,10 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\newcommand{\small}{% +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi +\DeclareRobustCommand{\small}{% \@setfontsize\small\@xxxpt{37}% \abovedisplayskip 30\p@ \@plus7\p@ \@minus11\p@ \abovedisplayshortskip \z@ \@plus7\p@ @@ -47,7 +50,7 @@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip } -\newcommand{\footnotesize}{% +\DeclareRobustCommand{\footnotesize}{% \@setfontsize\footnotesize\@xxvpt{30}% \abovedisplayskip 25\p@ \@plus6\p@ \@minus10\p@ \abovedisplayshortskip \z@ \@plus6\p@ @@ -58,15 +61,15 @@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip } -\newcommand*{\miniscule}{\@setfontsize\miniscule\@xivpt{17.5}} -\newcommand*{\tiny}{\@setfontsize\tiny\@xviipt{22}} -\newcommand*{\scriptsize}{\@setfontsize\scriptsize\@xxpt{25}} -\newcommand*{\large}{\@setfontsize\large\@xlviiipt{60}} -\newcommand*{\Large}{\@setfontsize\Large\@lxpt{72}} -\newcommand*{\LARGE}{\@setfontsize\LARGE\@lxxiipt{86}} -\newcommand*{\huge}{\@setfontsize\huge\@lxxxivpt{100}} -\newcommand*{\Huge}{\@setfontsize\Huge\@xcvipt{116}} -\newcommand*{\HUGE}{\@setfontsize\HUGE\@cviiipt{132}} +\DeclareRobustCommand{\miniscule}{\@setfontsize\miniscule\@xivpt{17.5}} +\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@xviipt{22}} +\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@xxpt{25}} +\DeclareRobustCommand{\large}{\@setfontsize\large\@xlviiipt{60}} +\DeclareRobustCommand{\Large}{\@setfontsize\Large\@lxpt{72}} +\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@lxxiipt{86}} +\DeclareRobustCommand{\huge}{\@setfontsize\huge\@lxxxivpt{100}} +\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xcvipt{116}} +\DeclareRobustCommand{\HUGE}{\@setfontsize\HUGE\@cviiipt{132}} \setlength{\onelineskip}{45\p@} \if@twocolumn \setlength\parindent{1em} diff --git a/Master/texmf-dist/tex/latex/memoir/mem48.clo b/Master/texmf-dist/tex/latex/memoir/mem48.clo index bf66e3303fe..fecd5e3c1e3 100644 --- a/Master/texmf-dist/tex/latex/memoir/mem48.clo +++ b/Master/texmf-dist/tex/latex/memoir/mem48.clo @@ -27,7 +27,7 @@ %% This work consists of the files listed in the README file. %% \ProvidesFile{mem48.clo}% - [2008/01/31 v0.1 memoir class 48pt size option] + [2022/07/29 v0.5 memoir class 48pt size option] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xlviiipt{60}% \abovedisplayskip 48\p@ \@plus9\p@ \@minus13\p@ @@ -36,7 +36,10 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\newcommand{\small}{% +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi +\DeclareRobustCommand{\small}{% \@setfontsize\small\@xxxvipt{45}% \abovedisplayskip 36\p@ \@plus8\p@ \@minus12\p@ \abovedisplayshortskip \z@ \@plus8\p@ @@ -47,7 +50,7 @@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip } -\newcommand{\footnotesize}{% +\DeclareRobustCommand{\footnotesize}{% \@setfontsize\footnotesize\@xxxpt{37}% \abovedisplayskip 30\p@ \@plus7\p@ \@minus11\p@ \abovedisplayshortskip \z@ \@plus7\p@ @@ -58,15 +61,15 @@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip } -\newcommand*{\miniscule}{\@setfontsize\miniscule\@xviipt{22}} -\newcommand*{\tiny}{\@setfontsize\tiny\@xxpt{25}} -\newcommand*{\scriptsize}{\@setfontsize\scriptsize\@xxvpt{30}} -\newcommand*{\large}{\@setfontsize\large\@lxpt{72}} -\newcommand*{\Large}{\@setfontsize\Large\@lxxiipt{86}} -\newcommand*{\LARGE}{\@setfontsize\LARGE\@lxxxivpt{100}} -\newcommand*{\huge}{\@setfontsize\huge\@xcvipt{116}} -\newcommand*{\Huge}{\@setfontsize\Huge\@cviiipt{132}} -\newcommand*{\HUGE}{\@setfontsize\HUGE\@cxxpt{144}} +\DeclareRobustCommand{\miniscule}{\@setfontsize\miniscule\@xviipt{22}} +\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@xxpt{25}} +\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@xxvpt{30}} +\DeclareRobustCommand{\large}{\@setfontsize\large\@lxpt{72}} +\DeclareRobustCommand{\Large}{\@setfontsize\Large\@lxxiipt{86}} +\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@lxxxivpt{100}} +\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xcvipt{116}} +\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@cviiipt{132}} +\DeclareRobustCommand{\HUGE}{\@setfontsize\HUGE\@cxxpt{144}} \setlength{\onelineskip}{60\p@} \if@twocolumn \setlength\parindent{1em} diff --git a/Master/texmf-dist/tex/latex/memoir/mem60.clo b/Master/texmf-dist/tex/latex/memoir/mem60.clo index 25b10eea2e8..31dbcc06056 100644 --- a/Master/texmf-dist/tex/latex/memoir/mem60.clo +++ b/Master/texmf-dist/tex/latex/memoir/mem60.clo @@ -27,7 +27,7 @@ %% This work consists of the files listed in the README file. %% \ProvidesFile{mem60.clo}% - [2008/01/31 v0.1 memoir class 60pt size option] + [2022/07/29 v0.5 memoir class 60pt size option] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@lxpt{72}% \abovedisplayskip 60\p@ \@plus10\p@ \@minus14\p@ @@ -36,7 +36,10 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\newcommand{\small}{% +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi +\DeclareRobustCommand{\small}{% \@setfontsize\small\@xlviiipt{60}% \abovedisplayskip 48\p@ \@plus9\p@ \@minus13\p@ \abovedisplayshortskip \z@ \@plus9\p@ @@ -47,7 +50,7 @@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip } -\newcommand{\footnotesize}{% +\DeclareRobustCommand{\footnotesize}{% \@setfontsize\footnotesize\@xxxvipt{45}% \abovedisplayskip 36\p@ \@plus8\p@ \@minus12\p@ \abovedisplayshortskip \z@ \@plus8\p@ @@ -58,15 +61,15 @@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip } -\newcommand*{\miniscule}{\@setfontsize\miniscule\@xxpt{25}} -\newcommand*{\tiny}{\@setfontsize\tiny\@xxvpt{30}} -\newcommand*{\scriptsize}{\@setfontsize\scriptsize\@xxxpt{37}} -\newcommand*{\large}{\@setfontsize\large\@lxxiipt{86}} -\newcommand*{\Large}{\@setfontsize\Large\@lxxxivpt{100}} -\newcommand*{\LARGE}{\@setfontsize\LARGE\@xcvipt{116}} -\newcommand*{\huge}{\@setfontsize\huge\@cviiipt{132}} -\newcommand*{\Huge}{\@setfontsize\Huge\@cxxpt{144}} -\newcommand*{\HUGE}{\@setfontsize\HUGE\@cxxxiipt{162}} +\DeclareRobustCommand{\miniscule}{\@setfontsize\miniscule\@xxpt{25}} +\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@xxvpt{30}} +\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@xxxpt{37}} +\DeclareRobustCommand{\large}{\@setfontsize\large\@lxxiipt{86}} +\DeclareRobustCommand{\Large}{\@setfontsize\Large\@lxxxivpt{100}} +\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xcvipt{116}} +\DeclareRobustCommand{\huge}{\@setfontsize\huge\@cviiipt{132}} +\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@cxxpt{144}} +\DeclareRobustCommand{\HUGE}{\@setfontsize\HUGE\@cxxxiipt{162}} \setlength{\onelineskip}{72\p@} \if@twocolumn \setlength\parindent{1em} diff --git a/Master/texmf-dist/tex/latex/memoir/mem9.clo b/Master/texmf-dist/tex/latex/memoir/mem9.clo index 7c63169eaac..3fecae9f10f 100644 --- a/Master/texmf-dist/tex/latex/memoir/mem9.clo +++ b/Master/texmf-dist/tex/latex/memoir/mem9.clo @@ -27,7 +27,7 @@ %% This work consists of the files listed in the README file. %% \ProvidesFile{mem9.clo}% - [2008/01/30 v0.4 memoir class 9pt size option] + [2022/07/29 v0.5 memoir class 9pt size option] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@ixpt\@xpt \abovedisplayskip 9\p@ \@plus 2\p@ \@minus 4.5\p@ @@ -36,7 +36,10 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\newcommand{\small}{% +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi +\DeclareRobustCommand{\small}{% \@setfontsize\small\@viiipt{9.5}% \abovedisplayskip 6\p@ \@plus 2\p@ \@minus 4\p@ \abovedisplayshortskip \z@ \@plus 2\p@ @@ -49,7 +52,7 @@ }% \belowdisplayskip \abovedisplayskip } -\newcommand{\footnotesize}{% +\DeclareRobustCommand{\footnotesize}{% \@setfontsize\footnotesize\@viipt{8}% \abovedisplayskip 6\p@ \@plus 2\p@ \@minus 4\p@ \abovedisplayshortskip \z@ \@plus 2\p@ @@ -63,18 +66,18 @@ \belowdisplayskip \abovedisplayskip } \ifextrafontsizes - \newcommand*{\miniscule}{\@setfontsize\miniscule\@ivpt{5}} + \DeclareRobustCommand{\miniscule}{\@setfontsize\miniscule\@ivpt{5}} \else - \newcommand*{\miniscule}{\@setfontsize\miniscule\@vpt{6}} + \DeclareRobustCommand{\miniscule}{\@setfontsize\miniscule\@vpt{6}} \fi -\newcommand*{\tiny}{\@setfontsize\tiny\@vpt{6}} -\newcommand*{\scriptsize}{\@setfontsize\scriptsize\@vipt{7}} -\newcommand*{\large}{\@setfontsize\large\@xpt{12}} -\newcommand*{\Large}{\@setfontsize\Large\@xipt{13.6}} -\newcommand*{\LARGE}{\@setfontsize\LARGE\@xiipt{14.5}} -\newcommand*{\huge}{\@setfontsize\huge\@xivpt{18}} -\newcommand*{\Huge}{\@setfontsize\Huge\@xviipt{22}} -\newcommand*{\HUGE}{\@setfontsize\HUGE\@xxpt{25}} +\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vpt{6}} +\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@vipt{7}} +\DeclareRobustCommand{\large}{\@setfontsize\large\@xpt{12}} +\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xipt{13.6}} +\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xiipt{14.5}} +\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xivpt{18}} +\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xviipt{22}} +\DeclareRobustCommand{\HUGE}{\@setfontsize\HUGE\@xxpt{25}} \setlength{\onelineskip}{\@xpt\p@} \if@twocolumn \setlength\parindent{1em} diff --git a/Master/texmf-dist/tex/latex/memoir/memoir.cls b/Master/texmf-dist/tex/latex/memoir/memoir.cls index 8974e5b466b..80d11470d51 100644 --- a/Master/texmf-dist/tex/latex/memoir/memoir.cls +++ b/Master/texmf-dist/tex/latex/memoir/memoir.cls @@ -28,8 +28,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesClass{memoir}% - [2022/02/20 v3.7q configurable book, report, article document class] -\newcommand\memversion{v3.7q, 2022/02/20} + [2022/07/29 v3.7r configurable book, report, article document class] +\newcommand\memversion{v3.7r, 2022/07/29} \RequirePackage{etoolbox} \newcommand*{\@ptsize}{} \newcommand*{\@memptsize}{} @@ -5667,7 +5667,7 @@ \@firstampfalse \global\@curtab\@ne \else - \@addtopreamble{&} + \@addtopreamble{&}% \global\advance\@curtab\@ne \fi} \let\@addamp\m@m@addamp @@ -9895,8 +9895,11 @@ \let\mp@footgroupv@r\@mppara@footgroupv@r {\foottextfont \dimen0=\baselineskip - \multiply\dimen0 by 1024 - \divide\dimen0 by \hsize \multiply\dimen0 by \footfudgefiddle + %\multiply\dimen0 by 1024 + \multiply\dimen0 by 256 + \divide\dimen0 by \hsize + \multiply\dimen0 by 4 + \multiply\dimen0 by \footfudgefiddle \xdef\footfudgefactor{\expandafter\strip@pt\dimen0 }}} \newcommand{\@parafootnotetext}[1]{\insert\footinsv@r{ @@ -9948,8 +9951,11 @@ \expandafter\count\csname footins#1\endcsname=1000\relax {\@nameuse{foottextfont#1}% \dimen0=\baselineskip - \multiply\dimen0 by 1024 - \divide\dimen0 by \hsize \multiply\dimen0 by 64 + %\multiply\dimen0 by 1024 + \multiply\dimen0 by 256 + \divide\dimen0 by \hsize + \multiply\dimen0 by 4 + \multiply\dimen0 by \footfudgefiddle \xdef\footfudgefactor{\expandafter\strip@pt\dimen0 }}} \newcommand{\m@make@parafootnotetext}[1]{% -- cgit v1.2.3