From b97aa19e35137596fcf0193abee3788b21250f32 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 2 Feb 2020 22:31:17 +0000 Subject: uplatex (2feb20) git-svn-id: svn://tug.org/texlive/trunk@53639 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/uplatex/base/ujarticle.cls | 13 +++++++------ Master/texmf-dist/tex/uplatex/base/ujbk10.clo | 6 ++++-- Master/texmf-dist/tex/uplatex/base/ujbk11.clo | 6 ++++-- Master/texmf-dist/tex/uplatex/base/ujbk12.clo | 6 ++++-- Master/texmf-dist/tex/uplatex/base/ujbook.cls | 13 +++++++------ Master/texmf-dist/tex/uplatex/base/ujreport.cls | 13 +++++++------ Master/texmf-dist/tex/uplatex/base/ujsize10.clo | 6 ++++-- Master/texmf-dist/tex/uplatex/base/ujsize11.clo | 6 ++++-- Master/texmf-dist/tex/uplatex/base/ujsize12.clo | 6 ++++-- Master/texmf-dist/tex/uplatex/base/uplcore.ltx | 6 +++--- Master/texmf-dist/tex/uplatex/base/upldefs.ltx | 15 ++------------- Master/texmf-dist/tex/uplatex/base/utarticle.cls | 13 +++++++------ Master/texmf-dist/tex/uplatex/base/utbk10.clo | 6 ++++-- Master/texmf-dist/tex/uplatex/base/utbk11.clo | 6 ++++-- Master/texmf-dist/tex/uplatex/base/utbk12.clo | 6 ++++-- Master/texmf-dist/tex/uplatex/base/utbook.cls | 13 +++++++------ Master/texmf-dist/tex/uplatex/base/utreport.cls | 13 +++++++------ Master/texmf-dist/tex/uplatex/base/utsize10.clo | 6 ++++-- Master/texmf-dist/tex/uplatex/base/utsize11.clo | 6 ++++-- Master/texmf-dist/tex/uplatex/base/utsize12.clo | 6 ++++-- 20 files changed, 95 insertions(+), 76 deletions(-) (limited to 'Master/texmf-dist/tex/uplatex') diff --git a/Master/texmf-dist/tex/uplatex/base/ujarticle.cls b/Master/texmf-dist/tex/uplatex/base/ujarticle.cls index 1e287918f6e..0c98c34a2ee 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/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -506,16 +506,17 @@ \usecounter{\@enumctr}% \def\makelabel##1{\hss\llap{##1}}}% \fi}{\endlist} -\newcommand{\labelitemi}{\textbullet} +\newcommand{\labelitemi}{\labelitemfont \textbullet} \newcommand{\labelitemii}{% \iftdir - {\textcircled{~}} + {\labelitemfont \textcircled{~}} \else - {\normalfont\bfseries\textendash} + {\labelitemfont \bfseries\textendash} \fi } -\newcommand{\labelitemiii}{\textasteriskcentered} -\newcommand{\labelitemiv}{\textperiodcentered} +\newcommand{\labelitemiii}{\labelitemfont \textasteriskcentered} +\newcommand{\labelitemiv}{\labelitemfont \textperiodcentered} +\newcommand\labelitemfont{\normalfont} \renewenvironment{itemize} {\ifnum \@itemdepth >\thr@@\@toodeep\else \advance\@itemdepth\@ne diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk10.clo b/Master/texmf-dist/tex/uplatex/base/ujbk10.clo index e19d4bc197d..d2e8e099f48 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/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% @@ -26,7 +26,9 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk11.clo b/Master/texmf-dist/tex/uplatex/base/ujbk11.clo index a6ff0560b91..472bed49708 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/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% @@ -26,7 +26,9 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk12.clo b/Master/texmf-dist/tex/uplatex/base/ujbk12.clo index 6fb0acb5538..8f19a855807 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/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% @@ -26,7 +26,9 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/uplatex/base/ujbook.cls b/Master/texmf-dist/tex/uplatex/base/ujbook.cls index 111d00da217..b7725e24d66 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/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -595,16 +595,17 @@ \usecounter{\@enumctr}% \def\makelabel##1{\hss\llap{##1}}}% \fi}{\endlist} -\newcommand{\labelitemi}{\textbullet} +\newcommand{\labelitemi}{\labelitemfont \textbullet} \newcommand{\labelitemii}{% \iftdir - {\textcircled{~}} + {\labelitemfont \textcircled{~}} \else - {\normalfont\bfseries\textendash} + {\labelitemfont \bfseries\textendash} \fi } -\newcommand{\labelitemiii}{\textasteriskcentered} -\newcommand{\labelitemiv}{\textperiodcentered} +\newcommand{\labelitemiii}{\labelitemfont \textasteriskcentered} +\newcommand{\labelitemiv}{\labelitemfont \textperiodcentered} +\newcommand\labelitemfont{\normalfont} \renewenvironment{itemize} {\ifnum \@itemdepth >\thr@@\@toodeep\else \advance\@itemdepth\@ne diff --git a/Master/texmf-dist/tex/uplatex/base/ujreport.cls b/Master/texmf-dist/tex/uplatex/base/ujreport.cls index 7db84ec2603..271577bb720 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/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -591,16 +591,17 @@ \usecounter{\@enumctr}% \def\makelabel##1{\hss\llap{##1}}}% \fi}{\endlist} -\newcommand{\labelitemi}{\textbullet} +\newcommand{\labelitemi}{\labelitemfont \textbullet} \newcommand{\labelitemii}{% \iftdir - {\textcircled{~}} + {\labelitemfont \textcircled{~}} \else - {\normalfont\bfseries\textendash} + {\labelitemfont \bfseries\textendash} \fi } -\newcommand{\labelitemiii}{\textasteriskcentered} -\newcommand{\labelitemiv}{\textperiodcentered} +\newcommand{\labelitemiii}{\labelitemfont \textasteriskcentered} +\newcommand{\labelitemiv}{\labelitemfont \textperiodcentered} +\newcommand\labelitemfont{\normalfont} \renewenvironment{itemize} {\ifnum \@itemdepth >\thr@@\@toodeep\else \advance\@itemdepth\@ne diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize10.clo b/Master/texmf-dist/tex/uplatex/base/ujsize10.clo index 886bb26500b..5d7c28c9856 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/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% @@ -26,7 +26,9 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize11.clo b/Master/texmf-dist/tex/uplatex/base/ujsize11.clo index a204aa078a5..33091809937 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/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% @@ -26,7 +26,9 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize12.clo b/Master/texmf-dist/tex/uplatex/base/ujsize12.clo index bc8729227f9..251b7c62ff2 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/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% @@ -26,7 +26,9 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx index 18e5e94a2fa..1f0b313646f 100644 --- a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx +++ b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx @@ -25,17 +25,17 @@ removing old `uplatex.ltx' and install the latest one}\@@end \else - \ifnum\expandafter\@parse@version\pfmtversion//00\@nil<20180309 + \ifnum\expandafter\@parse@version\pfmtversion//00\@nil<20200202 \errhelp{Please update your TeX installation; if not available, obtain it^^Jmanually from CTAN (https://ctan.org/pkg/platex) or from^^JGitHub (https://github.com/texjporg/platex).}% - \errmessage{This version of upLaTeX2e requires pLaTeX2e 2018/03/09 + \errmessage{This version of upLaTeX2e requires pLaTeX2e 2020/02/02 or newer!^^JObtain a newer version of `platex', otherwise upLaTeX2e setup will^^Jnever succeed}\@@end \fi \fi -\def\uppatch@level{u02} +\def\uppatch@level{u03} \edef\pfmtversion{\pfmtversion\uppatch@level} %% File: uplvers.dtx \def\documentstyle{% diff --git a/Master/texmf-dist/tex/uplatex/base/upldefs.ltx b/Master/texmf-dist/tex/uplatex/base/upldefs.ltx index 0a56c6ff9c9..63b7fa36cc8 100644 --- a/Master/texmf-dist/tex/uplatex/base/upldefs.ltx +++ b/Master/texmf-dist/tex/uplatex/base/upldefs.ltx @@ -15,7 +15,7 @@ %% %% File: uplfonts.dtx \ProvidesFile{upldefs.ltx} - [2019/09/22 v1.6t-u02 upLaTeX Kernel (Default settings)] + [2020/02/01 v1.6v-u02 upLaTeX Kernel (Default settings)] \DeclareKanjiEncodingDefaults{}{} \DeclareErrorKanjiFont{JY2}{mc}{m}{n}{10} \kanjifamily{mc} @@ -32,7 +32,7 @@ \newcommand\kanjiencodingdefault{JY2} \newcommand\kanjifamilydefault{\mcdefault} \newcommand\kanjiseriesdefault{\mddefault} -\newcommand\kanjishapedefault{\updefault} +\newcommand\kanjishapedefault{n}% formerly \updefault \kanjiencoding{JY2} \input{jy2mc.fd} \input{jy2gt.fd} @@ -40,12 +40,6 @@ \input{jt2gt.fd} \fontencoding{JT2}\selectfont \fontencoding{JY2}\selectfont -\DeclareTextFontCommand{\textmc}{\mcfamily} -\DeclareTextFontCommand{\textgt}{\gtfamily} -\DeclareRobustCommand\em - {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ - \eminnershape \else \gtfamily \itshape \fi}% -\def\eminnershape{\mcfamily \upshape}% \DeclarePreloadSizes{JY2}{mc}{m}{n}{5,7,10,12} \DeclarePreloadSizes{JY2}{gt}{m}{n}{5,7,10,12} \DeclarePreloadSizes{JT2}{mc}{m}{n}{5,7,10,12} @@ -63,11 +57,6 @@ \xkanjiskip=.25zw plus1pt minus1pt \autoxspacing \jcharwidowpenalty=500 -\ifx\protected\@undefined -\def\<{\inhibitglue} -\else -\protected\def\<{\ifvmode\leavevmode\fi\inhibitglue} -\fi \endinput %% %% End of file `upldefs.ltx'. diff --git a/Master/texmf-dist/tex/uplatex/base/utarticle.cls b/Master/texmf-dist/tex/uplatex/base/utarticle.cls index 49747e1a184..c7784093160 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/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -510,16 +510,17 @@ \usecounter{\@enumctr}% \def\makelabel##1{\hss\llap{##1}}}% \fi}{\endlist} -\newcommand{\labelitemi}{\textbullet} +\newcommand{\labelitemi}{\labelitemfont \textbullet} \newcommand{\labelitemii}{% \iftdir - {\textcircled{~}} + {\labelitemfont \textcircled{~}} \else - {\normalfont\bfseries\textendash} + {\labelitemfont \bfseries\textendash} \fi } -\newcommand{\labelitemiii}{\textasteriskcentered} -\newcommand{\labelitemiv}{\textperiodcentered} +\newcommand{\labelitemiii}{\labelitemfont \textasteriskcentered} +\newcommand{\labelitemiv}{\labelitemfont \textperiodcentered} +\newcommand\labelitemfont{\normalfont} \renewenvironment{itemize} {\ifnum \@itemdepth >\thr@@\@toodeep\else \advance\@itemdepth\@ne diff --git a/Master/texmf-dist/tex/uplatex/base/utbk10.clo b/Master/texmf-dist/tex/uplatex/base/utbk10.clo index 64915253ad9..3a54d099b7a 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/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% @@ -28,7 +28,9 @@ \def\kanjiencodingdefault{JT2}% \kanjiencoding{\kanjiencodingdefault}% \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/uplatex/base/utbk11.clo b/Master/texmf-dist/tex/uplatex/base/utbk11.clo index 4e7291a1e3a..d942807202b 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/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% @@ -28,7 +28,9 @@ \def\kanjiencodingdefault{JT2}% \kanjiencoding{\kanjiencodingdefault}% \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/uplatex/base/utbk12.clo b/Master/texmf-dist/tex/uplatex/base/utbk12.clo index ec8f39dc2ae..57096af4a45 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/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% @@ -28,7 +28,9 @@ \def\kanjiencodingdefault{JT2}% \kanjiencoding{\kanjiencodingdefault}% \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/uplatex/base/utbook.cls b/Master/texmf-dist/tex/uplatex/base/utbook.cls index 448f4ae263d..6c83c66dcd1 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/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -599,16 +599,17 @@ \usecounter{\@enumctr}% \def\makelabel##1{\hss\llap{##1}}}% \fi}{\endlist} -\newcommand{\labelitemi}{\textbullet} +\newcommand{\labelitemi}{\labelitemfont \textbullet} \newcommand{\labelitemii}{% \iftdir - {\textcircled{~}} + {\labelitemfont \textcircled{~}} \else - {\normalfont\bfseries\textendash} + {\labelitemfont \bfseries\textendash} \fi } -\newcommand{\labelitemiii}{\textasteriskcentered} -\newcommand{\labelitemiv}{\textperiodcentered} +\newcommand{\labelitemiii}{\labelitemfont \textasteriskcentered} +\newcommand{\labelitemiv}{\labelitemfont \textperiodcentered} +\newcommand\labelitemfont{\normalfont} \renewenvironment{itemize} {\ifnum \@itemdepth >\thr@@\@toodeep\else \advance\@itemdepth\@ne diff --git a/Master/texmf-dist/tex/uplatex/base/utreport.cls b/Master/texmf-dist/tex/uplatex/base/utreport.cls index ef31509aa2b..84068451bdc 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/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -595,16 +595,17 @@ \usecounter{\@enumctr}% \def\makelabel##1{\hss\llap{##1}}}% \fi}{\endlist} -\newcommand{\labelitemi}{\textbullet} +\newcommand{\labelitemi}{\labelitemfont \textbullet} \newcommand{\labelitemii}{% \iftdir - {\textcircled{~}} + {\labelitemfont \textcircled{~}} \else - {\normalfont\bfseries\textendash} + {\labelitemfont \bfseries\textendash} \fi } -\newcommand{\labelitemiii}{\textasteriskcentered} -\newcommand{\labelitemiv}{\textperiodcentered} +\newcommand{\labelitemiii}{\labelitemfont \textasteriskcentered} +\newcommand{\labelitemiv}{\labelitemfont \textperiodcentered} +\newcommand\labelitemfont{\normalfont} \renewenvironment{itemize} {\ifnum \@itemdepth >\thr@@\@toodeep\else \advance\@itemdepth\@ne diff --git a/Master/texmf-dist/tex/uplatex/base/utsize10.clo b/Master/texmf-dist/tex/uplatex/base/utsize10.clo index ab856728c77..3e2d5c0cf19 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/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% @@ -28,7 +28,9 @@ \def\kanjiencodingdefault{JT2}% \kanjiencoding{\kanjiencodingdefault}% \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/uplatex/base/utsize11.clo b/Master/texmf-dist/tex/uplatex/base/utsize11.clo index d6cb678c5e2..333d341d1f5 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/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% @@ -28,7 +28,9 @@ \def\kanjiencodingdefault{JT2}% \kanjiencoding{\kanjiencodingdefault}% \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/uplatex/base/utsize12.clo b/Master/texmf-dist/tex/uplatex/base/utsize12.clo index 72c8cce45ae..cf9d7f01af0 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/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% @@ -28,7 +28,9 @@ \def\kanjiencodingdefault{JT2}% \kanjiencoding{\kanjiencodingdefault}% \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} -- cgit v1.2.3