From 9239672f2650e60ba848bb9776c0fff31b74a048 Mon Sep 17 00:00:00 2001 From: Hironori Kitagawa Date: Fri, 30 Dec 2016 15:16:52 +0900 Subject: [PATCH] ltjclasses: sync with platex/66fb7476 --- src/ltjarticle.cls | 2 +- src/ltjbk10.clo | 2 +- src/ltjbk11.clo | 2 +- src/ltjbk12.clo | 2 +- src/ltjbook.cls | 8 ++++++-- src/ltjclasses.dtx | 15 +++++++++++++-- src/ltjreport.cls | 8 ++++++-- src/ltjsize10.clo | 2 +- src/ltjsize11.clo | 2 +- src/ltjsize12.clo | 2 +- src/ltjtarticle.cls | 2 +- src/ltjtbk10.clo | 2 +- src/ltjtbk11.clo | 2 +- src/ltjtbk12.clo | 2 +- src/ltjtbook.cls | 8 ++++++-- src/ltjtreport.cls | 8 ++++++-- src/ltjtsize10.clo | 2 +- src/ltjtsize11.clo | 2 +- src/ltjtsize12.clo | 2 +- 19 files changed, 51 insertions(+), 24 deletions(-) diff --git a/src/ltjarticle.cls b/src/ltjarticle.cls index 739036d..433d067 100644 --- a/src/ltjarticle.cls +++ b/src/ltjarticle.cls @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjarticle} - [2016/11/24 v1.7b-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} diff --git a/src/ltjbk10.clo b/src/ltjbk10.clo index f3d5d78..6b7738f 100644 --- a/src/ltjbk10.clo +++ b/src/ltjbk10.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk10.clo} - [2016/11/24 v1.7b-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/src/ltjbk11.clo b/src/ltjbk11.clo index f7b55a4..667d291 100644 --- a/src/ltjbk11.clo +++ b/src/ltjbk11.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk11.clo} - [2016/11/24 v1.7b-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/src/ltjbk12.clo b/src/ltjbk12.clo index 88a62a6..24f25e2 100644 --- a/src/ltjbk12.clo +++ b/src/ltjbk12.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk12.clo} - [2016/11/24 v1.7b-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/src/ltjbook.cls b/src/ltjbook.cls index 3fb94bc..4d1cd41 100644 --- a/src/ltjbook.cls +++ b/src/ltjbook.cls @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjbook} - [2016/11/24 v1.7b-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -449,7 +449,11 @@ \Huge\bfseries#1\par}% \@endpart} \def\@endpart{\vfil\newpage - \if@twoside\null\thispagestyle{empty}\newpage\fi + \if@twoside + \if@openright %% added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi %% added (2016/12/18) + \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% \if@openright\cleardoublepage\else\clearpage\fi diff --git a/src/ltjclasses.dtx b/src/ltjclasses.dtx index 43fad1f..7462506 100644 --- a/src/ltjclasses.dtx +++ b/src/ltjclasses.dtx @@ -87,6 +87,8 @@ % \changes{v1.7a}{2016/11/16}{Use \cs{expandafter} % (sync with ltlists.dtx v1.0j)} % \changes{v1.7b}{2016/11/22}{補足ドキュメントを追加} +% \changes{v1.7c}{2016/12/18}{Only add empty page after part if +% twoside and openright (sync with classes.dtx v1.4b)} % \fi % % \iffalse @@ -116,7 +118,7 @@ %<11pt&bk>\ProvidesFile{ltjtbk11.clo} %<12pt&bk>\ProvidesFile{ltjtbk12.clo} % - [2016/11/24 v1.7b-ltj-11 + [2016/12/30 v1.7c-ltj-11 % Standard LuaLaTeX-ja class] %<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)] %<*driver> @@ -2648,10 +2650,19 @@ % |\@part|と|\@spart|の最後で実行されるマクロです。 % 両面印刷モードのときは、白ページを追加します。 % 二段組モードのときには、これ以降のページを二段組に戻します。 +% 2016年12月から、|openany| のときに白ページを追加するのをやめました。 +% このバグは\LaTeX{}ではclasses.dtx v1.4b (2000/05/19)で修正されていました。 +% （参考：latex/3155、texjporg/jsclasses\#48） +% \changes{v1.7c}{2016/12/18}{Only add empty page after part if +% twoside and openright (sync with classes.dtx v1.4b)} % \begin{macrocode} %<*report|book> \def\@endpart{\vfil\newpage - \if@twoside\null\thispagestyle{empty}\newpage\fi + \if@twoside + \if@openright %% added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi %% added (2016/12/18) + \fi % \end{macrocode} % 二段組文書のとき、スイッチを二段組モードに戻す必要があります。 % \begin{macrocode} diff --git a/src/ltjreport.cls b/src/ltjreport.cls index 1421e49..33759b9 100644 --- a/src/ltjreport.cls +++ b/src/ltjreport.cls @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjreport} - [2016/11/24 v1.7b-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -450,7 +450,11 @@ \Huge\bfseries#1\par}% \@endpart} \def\@endpart{\vfil\newpage - \if@twoside\null\thispagestyle{empty}\newpage\fi + \if@twoside + \if@openright %% added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi %% added (2016/12/18) + \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% \if@openright\cleardoublepage\else\clearpage\fi diff --git a/src/ltjsize10.clo b/src/ltjsize10.clo index d298a19..d339d1d 100644 --- a/src/ltjsize10.clo +++ b/src/ltjsize10.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize10.clo} - [2016/11/24 v1.7b-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/src/ltjsize11.clo b/src/ltjsize11.clo index e43cab9..fbcfdf0 100644 --- a/src/ltjsize11.clo +++ b/src/ltjsize11.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize11.clo} - [2016/11/24 v1.7b-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/src/ltjsize12.clo b/src/ltjsize12.clo index f1d5c21..832fbbd 100644 --- a/src/ltjsize12.clo +++ b/src/ltjsize12.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize12.clo} - [2016/11/24 v1.7b-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/src/ltjtarticle.cls b/src/ltjtarticle.cls index ac8a757..8618b84 100644 --- a/src/ltjtarticle.cls +++ b/src/ltjtarticle.cls @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtarticle} - [2016/11/24 v1.7b-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} diff --git a/src/ltjtbk10.clo b/src/ltjtbk10.clo index 47cfd86..8407ede 100644 --- a/src/ltjtbk10.clo +++ b/src/ltjtbk10.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk10.clo} - [2016/11/24 v1.7b-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff --git a/src/ltjtbk11.clo b/src/ltjtbk11.clo index 06794f4..2b16398 100644 --- a/src/ltjtbk11.clo +++ b/src/ltjtbk11.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk11.clo} - [2016/11/24 v1.7b-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff --git a/src/ltjtbk12.clo b/src/ltjtbk12.clo index 96ad502..bbd6a73 100644 --- a/src/ltjtbk12.clo +++ b/src/ltjtbk12.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk12.clo} - [2016/11/24 v1.7b-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% diff --git a/src/ltjtbook.cls b/src/ltjtbook.cls index f745822..d5b7d71 100644 --- a/src/ltjtbook.cls +++ b/src/ltjtbook.cls @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtbook} - [2016/11/24 v1.7b-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -464,7 +464,11 @@ \Huge\bfseries#1\par}% \@endpart} \def\@endpart{\vfil\newpage - \if@twoside\null\thispagestyle{empty}\newpage\fi + \if@twoside + \if@openright %% added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi %% added (2016/12/18) + \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% \if@openright\cleardoublepage\else\clearpage\fi diff --git a/src/ltjtreport.cls b/src/ltjtreport.cls index a0b4abf..8ee39d1 100644 --- a/src/ltjtreport.cls +++ b/src/ltjtreport.cls @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtreport} - [2016/11/24 v1.7b-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -465,7 +465,11 @@ \Huge\bfseries#1\par}% \@endpart} \def\@endpart{\vfil\newpage - \if@twoside\null\thispagestyle{empty}\newpage\fi + \if@twoside + \if@openright %% added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi %% added (2016/12/18) + \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% \if@openright\cleardoublepage\else\clearpage\fi diff --git a/src/ltjtsize10.clo b/src/ltjtsize10.clo index 8f30d60..2db5932 100644 --- a/src/ltjtsize10.clo +++ b/src/ltjtsize10.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize10.clo} - [2016/11/24 v1.7b-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff --git a/src/ltjtsize11.clo b/src/ltjtsize11.clo index e0cbe0f..2de0cd6 100644 --- a/src/ltjtsize11.clo +++ b/src/ltjtsize11.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize11.clo} - [2016/11/24 v1.7b-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff --git a/src/ltjtsize12.clo b/src/ltjtsize12.clo index ea78d43..8bd583c 100644 --- a/src/ltjtsize12.clo +++ b/src/ltjtsize12.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize12.clo} - [2016/11/24 v1.7b-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% -- 2.11.0