summaryrefslogtreecommitdiff
path: root/language/japanese/platex/jclasses.dtx
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-02-03 03:02:01 +0000
committerNorbert Preining <norbert@preining.info>2020-02-03 03:02:01 +0000
commit34897eebd22c3de968b64f09bb4a371d96cb0b89 (patch)
tree19a50e54fca63f1f6482d6cb4c2fdee676fd97b1 /language/japanese/platex/jclasses.dtx
parente05dc0bb38b16bfb9ba35591285e40af0adaadc4 (diff)
CTAN sync 202002030302
Diffstat (limited to 'language/japanese/platex/jclasses.dtx')
-rw-r--r--language/japanese/platex/jclasses.dtx31
1 files changed, 23 insertions, 8 deletions
diff --git a/language/japanese/platex/jclasses.dtx b/language/japanese/platex/jclasses.dtx
index cf77787d31..1ac4a591d2 100644
--- a/language/japanese/platex/jclasses.dtx
+++ b/language/japanese/platex/jclasses.dtx
@@ -3,7 +3,7 @@
%
% Copyright 1995-2001 ASCII Corporation.
% Copyright (c) 2010 ASCII MEDIA WORKS
-% Copyright (c) 2016-2019 Japanese TeX Development Community
+% Copyright (c) 2016-2020 Japanese TeX Development Community
%
% This file is part of the pLaTeX2e system (community edition).
% -------------------------------------------------------------
@@ -100,6 +100,11 @@
% \changes{v1.8b}{2019/04/02}{$B?7859fBP1~(B}
% \changes{v1.8c}{2019/10/17}{$B%U%)%s%H%5%$%:JQ99L?Na$r(Brobust$B$K(B
% (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)}
+% \changes{v1.8e}{2020/01/03}{Normalize label fonts
+% (sync with classes.dtx 2019/12/20 v1.4l)}
% \fi
%
% \iffalse
@@ -129,7 +134,7 @@
%<11pt&bk>\ProvidesFile{tbk11.clo}
%<12pt&bk>\ProvidesFile{tbk12.clo}
%</tate>
- [2019/10/17 v1.8c
+ [2020/01/03 v1.8e
%<article|report|book> Standard pLaTeX class]
%<10pt|11pt|12pt> Standard pLaTeX file (size option)]
%<*driver>
@@ -617,10 +622,17 @@
% $B%+!<%M%k$NDj5A$r(B|\renewcommand|$B$7$?8e$K(B|\MakeRobust|$B$r;H$C$F$$$kM}M3$O!"(B
% $B%m%0$K(B |LaTeX Info: Redefining \normalsize on input line ...| $B$H$$$&(B
% $B%a%C%;!<%8$r=P$7$?$/$J$$$+$i$G$9!#(B
+% $B$?$@$7!"(B\textsf{latexrelease}$B%Q%C%1!<%8$G(B2015/01/01$B$h$j(B
+% $B@N$NF|IU$K4,$-La$C$F$$$k>l9g$O(B|\MakeRobust|$B$,Dj5A$5$l$F$$$^$;$s!#(B
% \changes{v1.8c}{2019/10/17}{$B%U%)%s%H%5%$%:JQ99L?Na$r(Brobust$B$K(B
% (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}
@@ -3347,17 +3359,20 @@
% itemize$B4D6-$N$=$l$>$l$N9`L\$N%i%Y%k$O!"(B
% |\labelenumi| \ldots\ |\labelenumiv|$B$G@8@.$5$l$^$9!#(B
% \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}