From 34897eebd22c3de968b64f09bb4a371d96cb0b89 Mon Sep 17 00:00:00 2001
From: Norbert Preining <norbert@preining.info>
Date: Mon, 3 Feb 2020 03:02:01 +0000
Subject: CTAN sync 202002030302

---
 language/japanese/uplatex/ujclasses.dtx | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

(limited to 'language/japanese/uplatex/ujclasses.dtx')

diff --git a/language/japanese/uplatex/ujclasses.dtx b/language/japanese/uplatex/ujclasses.dtx
index 98581b7f8b..1cc6c91c99 100644
--- a/language/japanese/uplatex/ujclasses.dtx
+++ b/language/japanese/uplatex/ujclasses.dtx
@@ -7,7 +7,7 @@
 %
 %  Copyright (c) 2010 ASCII MEDIA WORKS
 %  Copyright (c) 2016 Takuji Tanaka
-%  Copyright (c) 2016-2019 Japanese TeX Development Community
+%  Copyright (c) 2016-2020 Japanese TeX Development Community
 %
 %  This file is part of the upLaTeX2e system (community edition).
 %  --------------------------------------------------------------
@@ -115,6 +115,13 @@
 % \changes{v1.8c}{2019/10/17}{フォントサイズ変更命令をrobustに
 %    (sync with classes.dtx 2019/08/27 v1.4j)}
 % \changes{v1.8c-u00}{2019/10/17}{p\LaTeX{}用に追随}
+% \changes{v1.8d}{2019/10/25}{Don't use \cs{MakeRobust} if
+%    in rollback prior to 2015
+%    (sync with classes.dtx 2019/10/25 v1.4k)}
+% \changes{v1.8d-u00}{2019/10/25}{p\LaTeX{}用に追随}
+% \changes{v1.8e}{2020/01/03}{Normalize label fonts
+%    (sync with classes.dtx 2019/12/20 v1.4l)}
+% \changes{v1.8e-u00}{2020/01/03}{p\LaTeX{}用に追随}
 % \fi
 %
 % \iffalse
@@ -144,7 +151,7 @@
 %<11pt&bk>\ProvidesFile{utbk11.clo}
 %<12pt&bk>\ProvidesFile{utbk12.clo}
 %</tate>
-  [2019/10/17 v1.8c-u00
+  [2020/01/03 v1.8e-u00
 %<article|report|book> Standard upLaTeX class]
 %<10pt|11pt|12pt>  Standard upLaTeX file (size option)]
 %<*driver>
@@ -633,10 +640,17 @@
 % カーネルの定義を|\renewcommand|した後に|\MakeRobust|を使っている理由は、
 % ログに |LaTeX Info: Redefining \normalsize on input line ...| という
 % メッセージを出したくないからです。
+% ただし、\textsf{latexrelease}パッケージで2015/01/01より
+% 昔の日付に巻き戻っている場合は|\MakeRobust|が定義されていません。
 % \changes{v1.8c}{2019/10/17}{フォントサイズ変更命令をrobustに
 %    (sync with classes.dtx 2019/08/27 v1.4j)}
+% \changes{v1.8d}{2019/10/25}{Don't use \cs{MakeRobust} if
+%    in rollback prior to 2015
+%    (sync with classes.dtx 2019/10/25 v1.4k)}
 %    \begin{macrocode}
-\MakeRobust\normalsize
+\ifx\MakeRobust\@undefined \else
+  \MakeRobust\normalsize
+\fi
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -3363,17 +3377,20 @@
 % itemize環境のそれぞれの項目のラベルは、
 % |\labelenumi| \ldots\ |\labelenumiv|で生成されます。
 % \changes{v1.1a}{1997/01/28}{Bug fix: \cs{labelitemii}.}
+% \changes{v1.8e}{2020/01/03}{Normalize label fonts
+%    (sync with classes.dtx 2019/12/20 v1.4l)}
 %    \begin{macrocode}
-\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}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
-- 
cgit v1.2.3

