From 42afaab1a60991af8eac73ed93c18ffa38b45cc4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 21 Oct 2019 21:00:12 +0000 Subject: uplatex (21oct19) git-svn-id: svn://tug.org/texlive/trunk@52477 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/uplatex/base/ujarticle.cls | 2 +- Master/texmf-dist/tex/uplatex/base/ujbk10.clo | 21 +++++++++++---------- Master/texmf-dist/tex/uplatex/base/ujbk11.clo | 21 +++++++++++---------- Master/texmf-dist/tex/uplatex/base/ujbk12.clo | 19 ++++++++++--------- Master/texmf-dist/tex/uplatex/base/ujbook.cls | 2 +- Master/texmf-dist/tex/uplatex/base/ujreport.cls | 2 +- Master/texmf-dist/tex/uplatex/base/ujsize10.clo | 21 +++++++++++---------- Master/texmf-dist/tex/uplatex/base/ujsize11.clo | 21 +++++++++++---------- Master/texmf-dist/tex/uplatex/base/ujsize12.clo | 19 ++++++++++--------- Master/texmf-dist/tex/uplatex/base/utarticle.cls | 2 +- Master/texmf-dist/tex/uplatex/base/utbk10.clo | 21 +++++++++++---------- Master/texmf-dist/tex/uplatex/base/utbk11.clo | 21 +++++++++++---------- Master/texmf-dist/tex/uplatex/base/utbk12.clo | 19 ++++++++++--------- Master/texmf-dist/tex/uplatex/base/utbook.cls | 2 +- Master/texmf-dist/tex/uplatex/base/utreport.cls | 2 +- Master/texmf-dist/tex/uplatex/base/utsize10.clo | 21 +++++++++++---------- Master/texmf-dist/tex/uplatex/base/utsize11.clo | 21 +++++++++++---------- Master/texmf-dist/tex/uplatex/base/utsize12.clo | 19 ++++++++++--------- 18 files changed, 134 insertions(+), 122 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/uplatex/base/ujarticle.cls b/Master/texmf-dist/tex/uplatex/base/ujarticle.cls index 2b148c04038..1e287918f6e 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujarticle.cls +++ b/Master/texmf-dist/tex/uplatex/base/ujarticle.cls @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{ujarticle} - [2019/04/02 v1.8b-u00 + [2019/10/17 v1.8c-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk10.clo b/Master/texmf-dist/tex/uplatex/base/ujbk10.clo index a0183517a84..e19d4bc197d 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujbk10.clo +++ b/Master/texmf-dist/tex/uplatex/base/ujbk10.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujbk10.clo} - [2019/04/02 v1.8b-u00 + [2019/10/17 v1.8c-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% @@ -26,6 +26,7 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize +\MakeRobust\normalsize \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} @@ -33,7 +34,7 @@ \setlength\Cvs{\baselineskip} \setlength\Chs{\wd0} \setbox0=\box\voidb@x -\newcommand{\small}{% +\DeclareRobustCommand{\small}{% \@setfontsize\small\@ixpt{11}% \abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@ \abovedisplayshortskip \z@ \@plus2\p@ @@ -43,7 +44,7 @@ \parsep 2\p@ \@plus\p@ \@minus\p@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip} -\newcommand{\footnotesize}{% +\DeclareRobustCommand{\footnotesize}{% \@setfontsize\footnotesize\@viiipt{9.5}% \abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@ \abovedisplayshortskip \z@ \@plus\p@ @@ -53,13 +54,13 @@ \parsep 2\p@ \@plus\p@ \@minus\p@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip} -\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt} -\newcommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt} -\newcommand{\large}{\@setfontsize\large\@xiipt{17}} -\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}} -\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}} -\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}} -\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}} +\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt} +\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt} +\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}} +\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}} +\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}} +\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}} +\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}} \setlength\headheight{12\p@} \setlength\headsep{.25in} \setlength\topskip{1\Cht} diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk11.clo b/Master/texmf-dist/tex/uplatex/base/ujbk11.clo index 0c1e82bf19b..a6ff0560b91 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujbk11.clo +++ b/Master/texmf-dist/tex/uplatex/base/ujbk11.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujbk11.clo} - [2019/04/02 v1.8b-u00 + [2019/10/17 v1.8c-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% @@ -26,6 +26,7 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize +\MakeRobust\normalsize \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} @@ -33,7 +34,7 @@ \setlength\Cvs{\baselineskip} \setlength\Chs{\wd0} \setbox0=\box\voidb@x -\newcommand{\small}{% +\DeclareRobustCommand{\small}{% \@setfontsize\small\@xpt\@xiipt \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@ \abovedisplayshortskip \z@ \@plus3\p@ @@ -43,7 +44,7 @@ \parsep 3\p@ \@plus2\p@ \@minus\p@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip} -\newcommand{\footnotesize}{% +\DeclareRobustCommand{\footnotesize}{% \@setfontsize\footnotesize\@ixpt{11}% \abovedisplayskip 8\p@ \@plus2\p@ \@minus4\p@ \abovedisplayshortskip \z@ \@plus\p@ @@ -53,13 +54,13 @@ \parsep 2\p@ \@plus\p@ \@minus\p@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip} -\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}} -\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt} -\newcommand{\large}{\@setfontsize\large\@xiipt{17}} -\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}} -\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}} -\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}} -\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}} +\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}} +\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt} +\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}} +\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}} +\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}} +\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}} +\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}} \setlength\headheight{12\p@} \setlength\headsep{.275in} \setlength\topskip{1\Cht} diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk12.clo b/Master/texmf-dist/tex/uplatex/base/ujbk12.clo index bc657b2eedc..6fb0acb5538 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujbk12.clo +++ b/Master/texmf-dist/tex/uplatex/base/ujbk12.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujbk12.clo} - [2019/04/02 v1.8b-u00 + [2019/10/17 v1.8c-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% @@ -26,6 +26,7 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize +\MakeRobust\normalsize \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} @@ -33,7 +34,7 @@ \setlength\Cvs{\baselineskip} \setlength\Chs{\wd0} \setbox0=\box\voidb@x -\newcommand{\small}{% +\DeclareRobustCommand{\small}{% \@setfontsize\small\@xipt{13.6}% \abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@ \abovedisplayshortskip \z@ \@plus3\p@ @@ -43,7 +44,7 @@ \parsep 4.5\p@ \@plus2\p@ \@minus\p@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip} -\newcommand{\footnotesize}{% +\DeclareRobustCommand{\footnotesize}{% \@setfontsize\footnotesize\@xpt\@xiipt \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@ \abovedisplayshortskip \z@ \@plus3\p@ @@ -53,12 +54,12 @@ \parsep 3\p@ \@plus2\p@ \@minus\p@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip} -\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}} -\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt} -\newcommand{\large}{\@setfontsize\large\@xivpt{21}} -\newcommand{\Large}{\@setfontsize\Large\@xviipt{25}} -\newcommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}} -\newcommand{\huge}{\@setfontsize\huge\@xxvpt{33}} +\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}} +\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt} +\DeclareRobustCommand{\large}{\@setfontsize\large\@xivpt{21}} +\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xviipt{25}} +\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}} +\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxvpt{33}} \let\Huge=\huge \setlength\headheight{12\p@} \setlength\headsep{.275in} diff --git a/Master/texmf-dist/tex/uplatex/base/ujbook.cls b/Master/texmf-dist/tex/uplatex/base/ujbook.cls index 3410991dea6..111d00da217 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujbook.cls +++ b/Master/texmf-dist/tex/uplatex/base/ujbook.cls @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{ujbook} - [2019/04/02 v1.8b-u00 + [2019/10/17 v1.8c-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse diff --git a/Master/texmf-dist/tex/uplatex/base/ujreport.cls b/Master/texmf-dist/tex/uplatex/base/ujreport.cls index 30535b6b7cd..7db84ec2603 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujreport.cls +++ b/Master/texmf-dist/tex/uplatex/base/ujreport.cls @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{ujreport} - [2019/04/02 v1.8b-u00 + [2019/10/17 v1.8c-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize10.clo b/Master/texmf-dist/tex/uplatex/base/ujsize10.clo index d17ffb46f3a..886bb26500b 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujsize10.clo +++ b/Master/texmf-dist/tex/uplatex/base/ujsize10.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujsize10.clo} - [2019/04/02 v1.8b-u00 + [2019/10/17 v1.8c-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% @@ -26,6 +26,7 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize +\MakeRobust\normalsize \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} @@ -33,7 +34,7 @@ \setlength\Cvs{\baselineskip} \setlength\Chs{\wd0} \setbox0=\box\voidb@x -\newcommand{\small}{% +\DeclareRobustCommand{\small}{% \@setfontsize\small\@ixpt{11}% \abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@ \abovedisplayshortskip \z@ \@plus2\p@ @@ -43,7 +44,7 @@ \parsep 2\p@ \@plus\p@ \@minus\p@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip} -\newcommand{\footnotesize}{% +\DeclareRobustCommand{\footnotesize}{% \@setfontsize\footnotesize\@viiipt{9.5}% \abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@ \abovedisplayshortskip \z@ \@plus\p@ @@ -53,13 +54,13 @@ \parsep 2\p@ \@plus\p@ \@minus\p@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip} -\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt} -\newcommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt} -\newcommand{\large}{\@setfontsize\large\@xiipt{17}} -\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}} -\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}} -\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}} -\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}} +\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt} +\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt} +\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}} +\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}} +\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}} +\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}} +\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}} \setlength\headheight{12\p@} \setlength\headsep{25\p@} \setlength\topskip{1\Cht} diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize11.clo b/Master/texmf-dist/tex/uplatex/base/ujsize11.clo index e4b3afdf409..a204aa078a5 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujsize11.clo +++ b/Master/texmf-dist/tex/uplatex/base/ujsize11.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujsize11.clo} - [2019/04/02 v1.8b-u00 + [2019/10/17 v1.8c-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% @@ -26,6 +26,7 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize +\MakeRobust\normalsize \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} @@ -33,7 +34,7 @@ \setlength\Cvs{\baselineskip} \setlength\Chs{\wd0} \setbox0=\box\voidb@x -\newcommand{\small}{% +\DeclareRobustCommand{\small}{% \@setfontsize\small\@xpt\@xiipt \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@ \abovedisplayshortskip \z@ \@plus3\p@ @@ -43,7 +44,7 @@ \parsep 3\p@ \@plus2\p@ \@minus\p@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip} -\newcommand{\footnotesize}{% +\DeclareRobustCommand{\footnotesize}{% \@setfontsize\footnotesize\@ixpt{11}% \abovedisplayskip 8\p@ \@plus2\p@ \@minus4\p@ \abovedisplayshortskip \z@ \@plus\p@ @@ -53,13 +54,13 @@ \parsep 2\p@ \@plus\p@ \@minus\p@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip} -\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}} -\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt} -\newcommand{\large}{\@setfontsize\large\@xiipt{17}} -\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}} -\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}} -\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}} -\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}} +\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}} +\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt} +\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}} +\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}} +\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}} +\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}} +\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}} \setlength\headheight{12\p@} \setlength\headsep{25\p@} \setlength\topskip{1\Cht} diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize12.clo b/Master/texmf-dist/tex/uplatex/base/ujsize12.clo index 2e42c5263a6..bc8729227f9 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujsize12.clo +++ b/Master/texmf-dist/tex/uplatex/base/ujsize12.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujsize12.clo} - [2019/04/02 v1.8b-u00 + [2019/10/17 v1.8c-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% @@ -26,6 +26,7 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize +\MakeRobust\normalsize \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} @@ -33,7 +34,7 @@ \setlength\Cvs{\baselineskip} \setlength\Chs{\wd0} \setbox0=\box\voidb@x -\newcommand{\small}{% +\DeclareRobustCommand{\small}{% \@setfontsize\small\@xipt{13.6}% \abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@ \abovedisplayshortskip \z@ \@plus3\p@ @@ -43,7 +44,7 @@ \parsep 4.5\p@ \@plus2\p@ \@minus\p@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip} -\newcommand{\footnotesize}{% +\DeclareRobustCommand{\footnotesize}{% \@setfontsize\footnotesize\@xpt\@xiipt \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@ \abovedisplayshortskip \z@ \@plus3\p@ @@ -53,12 +54,12 @@ \parsep 3\p@ \@plus2\p@ \@minus\p@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip} -\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}} -\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt} -\newcommand{\large}{\@setfontsize\large\@xivpt{21}} -\newcommand{\Large}{\@setfontsize\Large\@xviipt{25}} -\newcommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}} -\newcommand{\huge}{\@setfontsize\huge\@xxvpt{33}} +\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}} +\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt} +\DeclareRobustCommand{\large}{\@setfontsize\large\@xivpt{21}} +\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xviipt{25}} +\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}} +\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxvpt{33}} \let\Huge=\huge \setlength\headheight{12\p@} \setlength\headsep{25\p@} diff --git a/Master/texmf-dist/tex/uplatex/base/utarticle.cls b/Master/texmf-dist/tex/uplatex/base/utarticle.cls index b438886efc4..49747e1a184 100644 --- a/Master/texmf-dist/tex/uplatex/base/utarticle.cls +++ b/Master/texmf-dist/tex/uplatex/base/utarticle.cls @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{utarticle} - [2019/04/02 v1.8b-u00 + [2019/10/17 v1.8c-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse diff --git a/Master/texmf-dist/tex/uplatex/base/utbk10.clo b/Master/texmf-dist/tex/uplatex/base/utbk10.clo index 0c6fed6d330..64915253ad9 100644 --- a/Master/texmf-dist/tex/uplatex/base/utbk10.clo +++ b/Master/texmf-dist/tex/uplatex/base/utbk10.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utbk10.clo} - [2019/04/02 v1.8b-u00 + [2019/10/17 v1.8c-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% @@ -28,6 +28,7 @@ \def\kanjiencodingdefault{JT2}% \kanjiencoding{\kanjiencodingdefault}% \normalsize +\MakeRobust\normalsize \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} @@ -35,7 +36,7 @@ \setlength\Cvs{\baselineskip} \setlength\Chs{\wd0} \setbox0=\box\voidb@x -\newcommand{\small}{% +\DeclareRobustCommand{\small}{% \@setfontsize\small\@ixpt{11}% \abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@ \abovedisplayshortskip \z@ \@plus2\p@ @@ -45,7 +46,7 @@ \parsep 2\p@ \@plus\p@ \@minus\p@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip} -\newcommand{\footnotesize}{% +\DeclareRobustCommand{\footnotesize}{% \@setfontsize\footnotesize\@viiipt{9.5}% \abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@ \abovedisplayshortskip \z@ \@plus\p@ @@ -55,13 +56,13 @@ \parsep 2\p@ \@plus\p@ \@minus\p@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip} -\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt} -\newcommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt} -\newcommand{\large}{\@setfontsize\large\@xiipt{17}} -\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}} -\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}} -\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}} -\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}} +\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt} +\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt} +\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}} +\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}} +\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}} +\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}} +\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}} \setlength\headheight{12\p@} \if@stysize \ifnum\c@@paper=2 % A5 diff --git a/Master/texmf-dist/tex/uplatex/base/utbk11.clo b/Master/texmf-dist/tex/uplatex/base/utbk11.clo index 4c8998f2627..4e7291a1e3a 100644 --- a/Master/texmf-dist/tex/uplatex/base/utbk11.clo +++ b/Master/texmf-dist/tex/uplatex/base/utbk11.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utbk11.clo} - [2019/04/02 v1.8b-u00 + [2019/10/17 v1.8c-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% @@ -28,6 +28,7 @@ \def\kanjiencodingdefault{JT2}% \kanjiencoding{\kanjiencodingdefault}% \normalsize +\MakeRobust\normalsize \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} @@ -35,7 +36,7 @@ \setlength\Cvs{\baselineskip} \setlength\Chs{\wd0} \setbox0=\box\voidb@x -\newcommand{\small}{% +\DeclareRobustCommand{\small}{% \@setfontsize\small\@xpt\@xiipt \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@ \abovedisplayshortskip \z@ \@plus3\p@ @@ -45,7 +46,7 @@ \parsep 3\p@ \@plus2\p@ \@minus\p@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip} -\newcommand{\footnotesize}{% +\DeclareRobustCommand{\footnotesize}{% \@setfontsize\footnotesize\@ixpt{11}% \abovedisplayskip 8\p@ \@plus2\p@ \@minus4\p@ \abovedisplayshortskip \z@ \@plus\p@ @@ -55,13 +56,13 @@ \parsep 2\p@ \@plus\p@ \@minus\p@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip} -\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}} -\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt} -\newcommand{\large}{\@setfontsize\large\@xiipt{17}} -\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}} -\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}} -\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}} -\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}} +\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}} +\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt} +\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}} +\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}} +\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}} +\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}} +\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}} \setlength\headheight{12\p@} \if@stysize \ifnum\c@@paper=2 % A5 diff --git a/Master/texmf-dist/tex/uplatex/base/utbk12.clo b/Master/texmf-dist/tex/uplatex/base/utbk12.clo index 12c26ed82f6..ec8f39dc2ae 100644 --- a/Master/texmf-dist/tex/uplatex/base/utbk12.clo +++ b/Master/texmf-dist/tex/uplatex/base/utbk12.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utbk12.clo} - [2019/04/02 v1.8b-u00 + [2019/10/17 v1.8c-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% @@ -28,6 +28,7 @@ \def\kanjiencodingdefault{JT2}% \kanjiencoding{\kanjiencodingdefault}% \normalsize +\MakeRobust\normalsize \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} @@ -35,7 +36,7 @@ \setlength\Cvs{\baselineskip} \setlength\Chs{\wd0} \setbox0=\box\voidb@x -\newcommand{\small}{% +\DeclareRobustCommand{\small}{% \@setfontsize\small\@xipt{13.6}% \abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@ \abovedisplayshortskip \z@ \@plus3\p@ @@ -45,7 +46,7 @@ \parsep 4.5\p@ \@plus2\p@ \@minus\p@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip} -\newcommand{\footnotesize}{% +\DeclareRobustCommand{\footnotesize}{% \@setfontsize\footnotesize\@xpt\@xiipt \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@ \abovedisplayshortskip \z@ \@plus3\p@ @@ -55,12 +56,12 @@ \parsep 3\p@ \@plus2\p@ \@minus\p@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip} -\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}} -\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt} -\newcommand{\large}{\@setfontsize\large\@xivpt{21}} -\newcommand{\Large}{\@setfontsize\Large\@xviipt{25}} -\newcommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}} -\newcommand{\huge}{\@setfontsize\huge\@xxvpt{33}} +\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}} +\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt} +\DeclareRobustCommand{\large}{\@setfontsize\large\@xivpt{21}} +\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xviipt{25}} +\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}} +\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxvpt{33}} \let\Huge=\huge \setlength\headheight{12\p@} \if@stysize diff --git a/Master/texmf-dist/tex/uplatex/base/utbook.cls b/Master/texmf-dist/tex/uplatex/base/utbook.cls index ca20440b629..448f4ae263d 100644 --- a/Master/texmf-dist/tex/uplatex/base/utbook.cls +++ b/Master/texmf-dist/tex/uplatex/base/utbook.cls @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{utbook} - [2019/04/02 v1.8b-u00 + [2019/10/17 v1.8c-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse diff --git a/Master/texmf-dist/tex/uplatex/base/utreport.cls b/Master/texmf-dist/tex/uplatex/base/utreport.cls index dc3d8e0ee73..ef31509aa2b 100644 --- a/Master/texmf-dist/tex/uplatex/base/utreport.cls +++ b/Master/texmf-dist/tex/uplatex/base/utreport.cls @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{utreport} - [2019/04/02 v1.8b-u00 + [2019/10/17 v1.8c-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse diff --git a/Master/texmf-dist/tex/uplatex/base/utsize10.clo b/Master/texmf-dist/tex/uplatex/base/utsize10.clo index 4cd15d2660e..ab856728c77 100644 --- a/Master/texmf-dist/tex/uplatex/base/utsize10.clo +++ b/Master/texmf-dist/tex/uplatex/base/utsize10.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utsize10.clo} - [2019/04/02 v1.8b-u00 + [2019/10/17 v1.8c-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% @@ -28,6 +28,7 @@ \def\kanjiencodingdefault{JT2}% \kanjiencoding{\kanjiencodingdefault}% \normalsize +\MakeRobust\normalsize \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} @@ -35,7 +36,7 @@ \setlength\Cvs{\baselineskip} \setlength\Chs{\wd0} \setbox0=\box\voidb@x -\newcommand{\small}{% +\DeclareRobustCommand{\small}{% \@setfontsize\small\@ixpt{11}% \abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@ \abovedisplayshortskip \z@ \@plus2\p@ @@ -45,7 +46,7 @@ \parsep 2\p@ \@plus\p@ \@minus\p@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip} -\newcommand{\footnotesize}{% +\DeclareRobustCommand{\footnotesize}{% \@setfontsize\footnotesize\@viiipt{9.5}% \abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@ \abovedisplayshortskip \z@ \@plus\p@ @@ -55,13 +56,13 @@ \parsep 2\p@ \@plus\p@ \@minus\p@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip} -\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt} -\newcommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt} -\newcommand{\large}{\@setfontsize\large\@xiipt{17}} -\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}} -\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}} -\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}} -\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}} +\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt} +\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt} +\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}} +\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}} +\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}} +\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}} +\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}} \setlength\headheight{12\p@} \if@stysize \ifnum\c@@paper=2 % A5 diff --git a/Master/texmf-dist/tex/uplatex/base/utsize11.clo b/Master/texmf-dist/tex/uplatex/base/utsize11.clo index 1d18b441113..d6cb678c5e2 100644 --- a/Master/texmf-dist/tex/uplatex/base/utsize11.clo +++ b/Master/texmf-dist/tex/uplatex/base/utsize11.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utsize11.clo} - [2019/04/02 v1.8b-u00 + [2019/10/17 v1.8c-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% @@ -28,6 +28,7 @@ \def\kanjiencodingdefault{JT2}% \kanjiencoding{\kanjiencodingdefault}% \normalsize +\MakeRobust\normalsize \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} @@ -35,7 +36,7 @@ \setlength\Cvs{\baselineskip} \setlength\Chs{\wd0} \setbox0=\box\voidb@x -\newcommand{\small}{% +\DeclareRobustCommand{\small}{% \@setfontsize\small\@xpt\@xiipt \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@ \abovedisplayshortskip \z@ \@plus3\p@ @@ -45,7 +46,7 @@ \parsep 3\p@ \@plus2\p@ \@minus\p@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip} -\newcommand{\footnotesize}{% +\DeclareRobustCommand{\footnotesize}{% \@setfontsize\footnotesize\@ixpt{11}% \abovedisplayskip 8\p@ \@plus2\p@ \@minus4\p@ \abovedisplayshortskip \z@ \@plus\p@ @@ -55,13 +56,13 @@ \parsep 2\p@ \@plus\p@ \@minus\p@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip} -\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}} -\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt} -\newcommand{\large}{\@setfontsize\large\@xiipt{17}} -\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}} -\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}} -\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}} -\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}} +\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}} +\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt} +\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}} +\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}} +\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}} +\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}} +\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}} \setlength\headheight{12\p@} \if@stysize \ifnum\c@@paper=2 % A5 diff --git a/Master/texmf-dist/tex/uplatex/base/utsize12.clo b/Master/texmf-dist/tex/uplatex/base/utsize12.clo index cde180d92a3..72c8cce45ae 100644 --- a/Master/texmf-dist/tex/uplatex/base/utsize12.clo +++ b/Master/texmf-dist/tex/uplatex/base/utsize12.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utsize12.clo} - [2019/04/02 v1.8b-u00 + [2019/10/17 v1.8c-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% @@ -28,6 +28,7 @@ \def\kanjiencodingdefault{JT2}% \kanjiencoding{\kanjiencodingdefault}% \normalsize +\MakeRobust\normalsize \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} @@ -35,7 +36,7 @@ \setlength\Cvs{\baselineskip} \setlength\Chs{\wd0} \setbox0=\box\voidb@x -\newcommand{\small}{% +\DeclareRobustCommand{\small}{% \@setfontsize\small\@xipt{13.6}% \abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@ \abovedisplayshortskip \z@ \@plus3\p@ @@ -45,7 +46,7 @@ \parsep 4.5\p@ \@plus2\p@ \@minus\p@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip} -\newcommand{\footnotesize}{% +\DeclareRobustCommand{\footnotesize}{% \@setfontsize\footnotesize\@xpt\@xiipt \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@ \abovedisplayshortskip \z@ \@plus3\p@ @@ -55,12 +56,12 @@ \parsep 3\p@ \@plus2\p@ \@minus\p@ \itemsep \parsep}% \belowdisplayskip \abovedisplayskip} -\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}} -\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt} -\newcommand{\large}{\@setfontsize\large\@xivpt{21}} -\newcommand{\Large}{\@setfontsize\Large\@xviipt{25}} -\newcommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}} -\newcommand{\huge}{\@setfontsize\huge\@xxvpt{33}} +\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}} +\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt} +\DeclareRobustCommand{\large}{\@setfontsize\large\@xivpt{21}} +\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xviipt{25}} +\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}} +\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxvpt{33}} \let\Huge=\huge \setlength\headheight{12\p@} \if@stysize -- cgit v1.2.3