From b0c4776b3895977319d383d45933916140842745 Mon Sep 17 00:00:00 2001 From: Hironori Kitagawa Date: Mon, 13 Jan 2020 12:37:04 +0900 Subject: [PATCH] sync with jclasses.dtx v1.1e (pLaTeX 9bf8efa1) --- src/ltjarticle.cls | 13 +++++++------ src/ltjbk10.clo | 2 +- src/ltjbk11.clo | 2 +- src/ltjbk12.clo | 2 +- src/ltjbook.cls | 13 +++++++------ src/ltjclasses.dtx | 19 ++++++++++++------- src/ltjreport.cls | 13 +++++++------ src/ltjsize10.clo | 2 +- src/ltjsize11.clo | 2 +- src/ltjsize12.clo | 2 +- src/ltjtarticle.cls | 13 +++++++------ src/ltjtbk10.clo | 2 +- src/ltjtbk11.clo | 2 +- src/ltjtbk12.clo | 2 +- src/ltjtbook.cls | 13 +++++++------ src/ltjtreport.cls | 13 +++++++------ src/ltjtsize10.clo | 2 +- src/ltjtsize11.clo | 2 +- src/ltjtsize12.clo | 2 +- 19 files changed, 66 insertions(+), 55 deletions(-) diff --git a/src/ltjarticle.cls b/src/ltjarticle.cls index 53e8971..f7c1334 100644 --- a/src/ltjarticle.cls +++ b/src/ltjarticle.cls @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjarticle} - [2019/11/23 v1.8d-ltj-17 + [2020/01/13 v1.8e-ltj-17 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -530,16 +530,17 @@ \usecounter{\@enumctr}% \def\makelabel##1{\hss\llap{##1}}}% \fi}{\endlist} -\newcommand{\labelitemi}{\textbullet} +\newcommand{\labelitemi}{\labelitemfont \textbullet} \newcommand{\labelitemii}{% \ifnum\ltjgetparameter{direction}=3 - {\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/src/ltjbk10.clo b/src/ltjbk10.clo index 6c5c20b..64c2c8f 100644 --- a/src/ltjbk10.clo +++ b/src/ltjbk10.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk10.clo} - [2019/11/23 v1.8d-ltj-17 + [2020/01/13 v1.8e-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/src/ltjbk11.clo b/src/ltjbk11.clo index 7cab67f..76611c5 100644 --- a/src/ltjbk11.clo +++ b/src/ltjbk11.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk11.clo} - [2019/11/23 v1.8d-ltj-17 + [2020/01/13 v1.8e-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/src/ltjbk12.clo b/src/ltjbk12.clo index dd568e7..c07a399 100644 --- a/src/ltjbk12.clo +++ b/src/ltjbk12.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk12.clo} - [2019/11/23 v1.8d-ltj-17 + [2020/01/13 v1.8e-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/src/ltjbook.cls b/src/ltjbook.cls index 0ebca7c..02a58a4 100644 --- a/src/ltjbook.cls +++ b/src/ltjbook.cls @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjbook} - [2019/11/23 v1.8d-ltj-17 + [2020/01/13 v1.8e-ltj-17 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -619,16 +619,17 @@ \usecounter{\@enumctr}% \def\makelabel##1{\hss\llap{##1}}}% \fi}{\endlist} -\newcommand{\labelitemi}{\textbullet} +\newcommand{\labelitemi}{\labelitemfont \textbullet} \newcommand{\labelitemii}{% \ifnum\ltjgetparameter{direction}=3 - {\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/src/ltjclasses.dtx b/src/ltjclasses.dtx index 3203b4d..9da4e2b 100644 --- a/src/ltjclasses.dtx +++ b/src/ltjclasses.dtx @@ -5,7 +5,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). % ------------------------------------------------------------- @@ -126,6 +126,8 @@ % \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 @@ -155,7 +157,7 @@ %<11pt&bk>\ProvidesFile{ltjtbk11.clo} %<12pt&bk>\ProvidesFile{ltjtbk12.clo} % - [2019/11/23 v1.8d-ltj-17 + [2020/01/13 v1.8e-ltj-17 % Standard LuaLaTeX-ja class] %<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)] %<*driver> @@ -3501,17 +3503,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}{% \ifnum\ltjgetparameter{direction}=3 - {\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} diff --git a/src/ltjreport.cls b/src/ltjreport.cls index d1d7ee9..94a61e3 100644 --- a/src/ltjreport.cls +++ b/src/ltjreport.cls @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjreport} - [2019/11/23 v1.8d-ltj-17 + [2020/01/13 v1.8e-ltj-17 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -615,16 +615,17 @@ \usecounter{\@enumctr}% \def\makelabel##1{\hss\llap{##1}}}% \fi}{\endlist} -\newcommand{\labelitemi}{\textbullet} +\newcommand{\labelitemi}{\labelitemfont \textbullet} \newcommand{\labelitemii}{% \ifnum\ltjgetparameter{direction}=3 - {\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/src/ltjsize10.clo b/src/ltjsize10.clo index 2ce08bc..a43efa4 100644 --- a/src/ltjsize10.clo +++ b/src/ltjsize10.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize10.clo} - [2019/11/23 v1.8d-ltj-17 + [2020/01/13 v1.8e-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/src/ltjsize11.clo b/src/ltjsize11.clo index 90f44c1..05e1877 100644 --- a/src/ltjsize11.clo +++ b/src/ltjsize11.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize11.clo} - [2019/11/23 v1.8d-ltj-17 + [2020/01/13 v1.8e-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/src/ltjsize12.clo b/src/ltjsize12.clo index c3affe5..cff0eb1 100644 --- a/src/ltjsize12.clo +++ b/src/ltjsize12.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize12.clo} - [2019/11/23 v1.8d-ltj-17 + [2020/01/13 v1.8e-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/src/ltjtarticle.cls b/src/ltjtarticle.cls index 54dda2a..e482ac4 100644 --- a/src/ltjtarticle.cls +++ b/src/ltjtarticle.cls @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtarticle} - [2019/11/23 v1.8d-ltj-17 + [2020/01/13 v1.8e-ltj-17 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -545,16 +545,17 @@ \usecounter{\@enumctr}% \def\makelabel##1{\hss\llap{##1}}}% \fi}{\endlist} -\newcommand{\labelitemi}{\textbullet} +\newcommand{\labelitemi}{\labelitemfont \textbullet} \newcommand{\labelitemii}{% \ifnum\ltjgetparameter{direction}=3 - {\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/src/ltjtbk10.clo b/src/ltjtbk10.clo index 5009b3f..ddb2614 100644 --- a/src/ltjtbk10.clo +++ b/src/ltjtbk10.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk10.clo} - [2019/11/23 v1.8d-ltj-17 + [2020/01/13 v1.8e-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff --git a/src/ltjtbk11.clo b/src/ltjtbk11.clo index 62c6d1b..43f937a 100644 --- a/src/ltjtbk11.clo +++ b/src/ltjtbk11.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk11.clo} - [2019/11/23 v1.8d-ltj-17 + [2020/01/13 v1.8e-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff --git a/src/ltjtbk12.clo b/src/ltjtbk12.clo index b0cbc23..36357c9 100644 --- a/src/ltjtbk12.clo +++ b/src/ltjtbk12.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk12.clo} - [2019/11/23 v1.8d-ltj-17 + [2020/01/13 v1.8e-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% diff --git a/src/ltjtbook.cls b/src/ltjtbook.cls index 03279bd..8bf5266 100644 --- a/src/ltjtbook.cls +++ b/src/ltjtbook.cls @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtbook} - [2019/11/23 v1.8d-ltj-17 + [2020/01/13 v1.8e-ltj-17 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -634,16 +634,17 @@ \usecounter{\@enumctr}% \def\makelabel##1{\hss\llap{##1}}}% \fi}{\endlist} -\newcommand{\labelitemi}{\textbullet} +\newcommand{\labelitemi}{\labelitemfont \textbullet} \newcommand{\labelitemii}{% \ifnum\ltjgetparameter{direction}=3 - {\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/src/ltjtreport.cls b/src/ltjtreport.cls index 58ece16..0db8d98 100644 --- a/src/ltjtreport.cls +++ b/src/ltjtreport.cls @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtreport} - [2019/11/23 v1.8d-ltj-17 + [2020/01/13 v1.8e-ltj-17 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -630,16 +630,17 @@ \usecounter{\@enumctr}% \def\makelabel##1{\hss\llap{##1}}}% \fi}{\endlist} -\newcommand{\labelitemi}{\textbullet} +\newcommand{\labelitemi}{\labelitemfont \textbullet} \newcommand{\labelitemii}{% \ifnum\ltjgetparameter{direction}=3 - {\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/src/ltjtsize10.clo b/src/ltjtsize10.clo index 202508c..dbd375a 100644 --- a/src/ltjtsize10.clo +++ b/src/ltjtsize10.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize10.clo} - [2019/11/23 v1.8d-ltj-17 + [2020/01/13 v1.8e-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff --git a/src/ltjtsize11.clo b/src/ltjtsize11.clo index 2a8a302..1e9e454 100644 --- a/src/ltjtsize11.clo +++ b/src/ltjtsize11.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize11.clo} - [2019/11/23 v1.8d-ltj-17 + [2020/01/13 v1.8e-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff --git a/src/ltjtsize12.clo b/src/ltjtsize12.clo index 7f41b6e..83c2358 100644 --- a/src/ltjtsize12.clo +++ b/src/ltjtsize12.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize12.clo} - [2019/11/23 v1.8d-ltj-17 + [2020/01/13 v1.8e-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% -- 2.11.0