texlive[43288] Master/texmf-dist: luatexja (21feb17)
commits+karl at tug.org
commits+karl at tug.org
Wed Feb 22 00:29:56 CET 2017
Revision: 43288
http://tug.org/svn/texlive?view=revision&revision=43288
Author: karl
Date: 2017-02-22 00:29:55 +0100 (Wed, 22 Feb 2017)
Log Message:
-----------
luatexja (21feb17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/luatex/luatexja/README
trunk/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf
trunk/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf
trunk/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx
trunk/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/README
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/luatexja/README 2017-02-21 23:29:27 UTC (rev 43287)
+++ trunk/Master/texmf-dist/doc/luatex/luatexja/README 2017-02-21 23:29:55 UTC (rev 43288)
@@ -1,4 +1,4 @@
-The LuaTeX-ja Package 20170219.0
+The LuaTeX-ja Package 20170221.0
--------------------------------
Copyright (c) 2011--2017 The LuaTeX-ja project
License: modified BSD (see COPYING)
@@ -34,9 +34,9 @@
2. If you must/want to install manually:
a. Download the source archive from CTAN,
- or tagged as 20170219.0 in the Git repository by
+ or tagged as 20170221.0 in the Git repository by
<http://git.osdn.jp/view?p=luatex-ja/luatexja.git
- ;a=snapshot;h=refs/tags/20170219.0;sf=tgz>
+ ;a=snapshot;h=refs/tags/20170221.0;sf=tgz>
b. Extract the archive and process following three files by LuaLaTeX
to generate classes for Japanese typesetting:
@@ -81,4 +81,4 @@
* src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use.
-Last commit date: Sun Feb 19 21:28:54 2017 +0900
+Last commit date: Tue Feb 21 16:52:59 2017 +0900
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx
===================================================================
--- trunk/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx 2017-02-21 23:29:27 UTC (rev 43287)
+++ trunk/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx 2017-02-21 23:29:55 UTC (rev 43288)
@@ -105,6 +105,8 @@
% \changes{v1.7d}{2017/02/15}{縦組クラスの所属表示の番号を直立にした}
% \changes{v1.7d-ltj-13}{2017/02/19}{縦組時クラスで|ftnright|パッケージを使うと
% 脚注番号が上書きされ横に寝てしまう問題を修正（aminophenさん，ありがとうございます）．}
+% \changes{v1.7d-ltj-14}{2017/02/20}{openleftオプションの処理で\cs{iftdir}, \cs{ifydir}を
+% 誤って使っている問題を修正（aminophenさん，ありがとうございます）．}
% \fi
%
% \iffalse
@@ -134,7 +136,7 @@
%<11pt&bk>\ProvidesFile{ltjtbk11.clo}
%<12pt&bk>\ProvidesFile{ltjtbk12.clo}
%</tate>
- [2017/02/19 v1.7d-ltj-13
+ [2017/02/20 v1.7d-ltj-14
%<article|report|book> Standard LuaLaTeX-ja class]
%<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)]
%<*driver>
@@ -1788,30 +1790,17 @@
% \item|\pltx at cleartoevenpage|：偶数ページになるまでページを繰る命令
% \end{enumerate}
% \changes{v1.7d}{2017/02/15}{\cs{cleardoublepage}の代用となる命令群を追加}
+% \changes{v1.7d-ltj-14}{2017/02/20}{\cs{iftdir}, \cs{ifydir}を使わないように修正}
% \begin{macrocode}
\def\pltx at cleartorightpage{\clearpage\if at twoside
- \ifodd\c at page
- \iftdir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
- \else
- \ifydir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
+ \unless\ifodd\numexpr\c at page+\ltjgetparameter{direction}\relax
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
\fi\fi}
\def\pltx at cleartoleftpage{\clearpage\if at twoside
- \ifodd\c at page
- \ifydir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
- \else
- \iftdir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
+ \ifodd\numexpr\c at page+\ltjgetparameter{direction}\relax
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
\fi\fi}
% \end{macrocode}
%
@@ -2285,7 +2274,7 @@
% \end{macrocode}
%
% そして、\LaTeX{}ネイティブのための定義です。
-+% \changes{v1.7d}{2017/02/15}{bookクラスでtitlepageを必ず奇数ページ
+% \changes{v1.7d}{2017/02/15}{bookクラスでtitlepageを必ず奇数ページ
% に送るように変更}
% \changes{v1.7d}{2017/02/15}{titlepageのページ番号を奇数ならば1に、
% 偶数ならば0にリセットするように変更}
@@ -2985,7 +2974,7 @@
% このマクロは、章見出しに番号を付けないときに呼び出されます。
%
% \emph{日本語\TeX{}開発コミュニティによる補足}：やはり二段組でチャプター
- タイトルより高い位置に右カラムの始点が来るという挙動を維持してあります。
+% タイトルより高い位置に右カラムの始点が来るという挙動を維持してあります。
% \changes{v1.7c}{2016/12/18}{奇妙なarticleガードとコードを削除して
% ドキュメントを追加}
% \begin{macrocode}
@@ -4572,8 +4561,10 @@
% パッケージ読み込み前に予め退避しておき、読み込み後に復帰させます。
% \changes{v1.7d}{2017/02/19}{コード追加}
% \begin{macrocode}
+%<*article|report|book>
\AtBeginOfPackageFile*{ftnright}{\let\ltjt at orig@@makefntext=\@makefntext}
\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
+%</article|report|book>
% \end{macrocode}
%
%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty 2017-02-21 23:29:27 UTC (rev 43287)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty 2017-02-21 23:29:55 UTC (rev 43288)
@@ -36,7 +36,7 @@
\def\p at array<#1>[#2]#3{%
\let\box at dir\relax
\if #1z\relax
- \ifnum\ltjgetparameter{direction}=3\relax
+ \ifnum\count@=3\relax
\let\box at dir\utod\@tempcnta=\zstrutbox
\fi
\else
@@ -688,7 +688,7 @@
%%% references
\def\@eqnnum{{\reset at font\rmfamily \normalcolor
- \ifnum\ltjgetparameter{direction}=3 \raise.25\zh\hbox{\yoko(\theequation)}%
+ \ifnum\ltjgetparameter{direction}=11\raise.25\zh\hbox{\yoko(\theequation)}%
\else (\theequation)\fi}}
\def\@thecounter#1{\noexpand\rensuji{\noexpand\arabic{#1}}}
\def\@thmcounter#1{\noexpand\rensuji{\noexpand\arabic{#1}}}
@@ -696,6 +696,8 @@
%% Compatibility with array package
\def\ltj at lltjext@patch at array{%
+ \patchcmd{\@tabular}{\hbox\bgroup}{%
+ \hbox\bgroup\count@=\ltjgetparameter{direction}}{}{}
\def\@startpbox##1{\bgroup
\box at dir\adjustbaseline%%% これを追加
\hsize=##1\@arrayparboxrestore
@@ -707,7 +709,7 @@
\def\p at array<##1>[##2]##3{%
\let\box at dir\relax
\if ##1z\relax
- \ifnum\ltjgetparameter{direction}=3\relax
+ \ifnum\count@=3\relax
\let\box at dir\utod\@tempcnta=\zstrutbox
\fi
\else
@@ -722,7 +724,7 @@
\fi\fi\fi\fi
\fi
\ifx\box at dir\relax
- \ifcase\ltjgetparameter{direction}
+ \ifcase\count@
\or \let\box at dir\dtou\@tempcnta=\tabskip \z@\tabskip \z@\dstrutbox% dtou
\or\or\let\box at dir\tate\@tempcnta=\tstrutbox% tate
\or \let\box at dir\yoko\@tempcnta=\strutbox% yoko
@@ -759,7 +761,7 @@
\let\ltj at lltjext@orig at tabularS\relax
\let\ltj at lltjext@orig at tabular\relax
\let\ltj at lltjext@orig at array\relax
- \RequirePackage{filehook}
+ \RequirePackage{filehook,etoolbox}
\AtEndOfPackageFile{array}{\ltj at lltjext@patch at array}
}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls 2017-02-21 23:29:27 UTC (rev 43287)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls 2017-02-21 23:29:55 UTC (rev 43288)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjarticle}
- [2017/02/19 v1.7d-ltj-13
+ [2017/02/20 v1.7d-ltj-14
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -188,28 +188,14 @@
\renewcommand{\dbltopfraction}{.7}
\renewcommand{\dblfloatpagefraction}{.5}
\def\pltx at cleartorightpage{\clearpage\if at twoside
- \ifodd\c at page
- \iftdir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
- \else
- \ifydir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
+ \unless\ifodd\numexpr\c at page+\ltjgetparameter{direction}\relax
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
\fi\fi}
\def\pltx at cleartoleftpage{\clearpage\if at twoside
- \ifodd\c at page
- \ifydir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
- \else
- \iftdir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
+ \ifodd\numexpr\c at page+\ltjgetparameter{direction}\relax
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
\fi\fi}
\def\pltx at cleartooddpage{\clearpage\if at twoside
\ifodd\c at page\else
@@ -303,7 +289,6 @@
}%
{\if at restonecol\twocolumn\else\newpage\fi
}
-+% \changes{v1.7d}{2017/02/15}{bookクラスでtitlepageを必ず奇数ページ
\else
\newenvironment{titlepage}
{%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo 2017-02-21 23:29:27 UTC (rev 43287)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo 2017-02-21 23:29:55 UTC (rev 43288)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk10.clo}
- [2017/02/19 v1.7d-ltj-13
+ [2017/02/20 v1.7d-ltj-14
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
@@ -294,8 +294,6 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-\AtBeginOfPackageFile*{ftnright}{\let\ltjt at orig@@makefntext=\@makefntext}
-\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjbk10.clo'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo 2017-02-21 23:29:27 UTC (rev 43287)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo 2017-02-21 23:29:55 UTC (rev 43288)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk11.clo}
- [2017/02/19 v1.7d-ltj-13
+ [2017/02/20 v1.7d-ltj-14
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
@@ -294,8 +294,6 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-\AtBeginOfPackageFile*{ftnright}{\let\ltjt at orig@@makefntext=\@makefntext}
-\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjbk11.clo'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo 2017-02-21 23:29:27 UTC (rev 43287)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo 2017-02-21 23:29:55 UTC (rev 43288)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk12.clo}
- [2017/02/19 v1.7d-ltj-13
+ [2017/02/20 v1.7d-ltj-14
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
@@ -294,8 +294,6 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-\AtBeginOfPackageFile*{ftnright}{\let\ltjt at orig@@makefntext=\@makefntext}
-\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjbk12.clo'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls 2017-02-21 23:29:27 UTC (rev 43287)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls 2017-02-21 23:29:55 UTC (rev 43288)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjbook}
- [2017/02/19 v1.7d-ltj-13
+ [2017/02/20 v1.7d-ltj-14
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -198,28 +198,14 @@
\renewcommand{\dbltopfraction}{.7}
\renewcommand{\dblfloatpagefraction}{.5}
\def\pltx at cleartorightpage{\clearpage\if at twoside
- \ifodd\c at page
- \iftdir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
- \else
- \ifydir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
+ \unless\ifodd\numexpr\c at page+\ltjgetparameter{direction}\relax
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
\fi\fi}
\def\pltx at cleartoleftpage{\clearpage\if at twoside
- \ifodd\c at page
- \ifydir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
- \else
- \iftdir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
+ \ifodd\numexpr\c at page+\ltjgetparameter{direction}\relax
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
\fi\fi}
\def\pltx at cleartooddpage{\clearpage\if at twoside
\ifodd\c at page\else
@@ -335,7 +321,6 @@
}%
{\if at restonecol\twocolumn\else\newpage\fi
}
-+% \changes{v1.7d}{2017/02/15}{bookクラスでtitlepageを必ず奇数ページ
\else
\newenvironment{titlepage}
{%
@@ -550,7 +535,6 @@
\else
#1\relax
\fi}\nobreak\vskip3\Cvs}
- タイトルより高い位置に右カラムの始点が来るという挙動を維持してあります。
\def\@schapter#1{%
\@makeschapterhead{#1}\@afterheading
}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls 2017-02-21 23:29:27 UTC (rev 43287)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls 2017-02-21 23:29:55 UTC (rev 43288)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjreport}
- [2017/02/19 v1.7d-ltj-13
+ [2017/02/20 v1.7d-ltj-14
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -196,28 +196,14 @@
\renewcommand{\dbltopfraction}{.7}
\renewcommand{\dblfloatpagefraction}{.5}
\def\pltx at cleartorightpage{\clearpage\if at twoside
- \ifodd\c at page
- \iftdir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
- \else
- \ifydir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
+ \unless\ifodd\numexpr\c at page+\ltjgetparameter{direction}\relax
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
\fi\fi}
\def\pltx at cleartoleftpage{\clearpage\if at twoside
- \ifodd\c at page
- \ifydir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
- \else
- \iftdir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
+ \ifodd\numexpr\c at page+\ltjgetparameter{direction}\relax
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
\fi\fi}
\def\pltx at cleartooddpage{\clearpage\if at twoside
\ifodd\c at page\else
@@ -324,7 +310,6 @@
}%
{\if at restonecol\twocolumn\else\newpage\fi
}
-+% \changes{v1.7d}{2017/02/15}{bookクラスでtitlepageを必ず奇数ページ
\else
\newenvironment{titlepage}
{%
@@ -544,7 +529,6 @@
\else
#1\relax
\fi}\nobreak\vskip3\Cvs}
- タイトルより高い位置に右カラムの始点が来るという挙動を維持してあります。
\def\@schapter#1{%
\@makeschapterhead{#1}\@afterheading
}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo 2017-02-21 23:29:27 UTC (rev 43287)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo 2017-02-21 23:29:55 UTC (rev 43288)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize10.clo}
- [2017/02/19 v1.7d-ltj-13
+ [2017/02/20 v1.7d-ltj-14
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
@@ -299,8 +299,6 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-\AtBeginOfPackageFile*{ftnright}{\let\ltjt at orig@@makefntext=\@makefntext}
-\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjsize10.clo'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo 2017-02-21 23:29:27 UTC (rev 43287)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo 2017-02-21 23:29:55 UTC (rev 43288)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize11.clo}
- [2017/02/19 v1.7d-ltj-13
+ [2017/02/20 v1.7d-ltj-14
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
@@ -299,8 +299,6 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-\AtBeginOfPackageFile*{ftnright}{\let\ltjt at orig@@makefntext=\@makefntext}
-\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjsize11.clo'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo 2017-02-21 23:29:27 UTC (rev 43287)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo 2017-02-21 23:29:55 UTC (rev 43288)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize12.clo}
- [2017/02/19 v1.7d-ltj-13
+ [2017/02/20 v1.7d-ltj-14
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
@@ -299,8 +299,6 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-\AtBeginOfPackageFile*{ftnright}{\let\ltjt at orig@@makefntext=\@makefntext}
-\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjsize12.clo'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls 2017-02-21 23:29:27 UTC (rev 43287)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls 2017-02-21 23:29:55 UTC (rev 43288)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtarticle}
- [2017/02/19 v1.7d-ltj-13
+ [2017/02/20 v1.7d-ltj-14
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -200,28 +200,14 @@
\renewcommand{\dbltopfraction}{.7}
\renewcommand{\dblfloatpagefraction}{.5}
\def\pltx at cleartorightpage{\clearpage\if at twoside
- \ifodd\c at page
- \iftdir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
- \else
- \ifydir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
+ \unless\ifodd\numexpr\c at page+\ltjgetparameter{direction}\relax
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
\fi\fi}
\def\pltx at cleartoleftpage{\clearpage\if at twoside
- \ifodd\c at page
- \ifydir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
- \else
- \iftdir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
+ \ifodd\numexpr\c at page+\ltjgetparameter{direction}\relax
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
\fi\fi}
\def\pltx at cleartooddpage{\clearpage\if at twoside
\ifodd\c at page\else
@@ -315,7 +301,6 @@
}%
{\if at restonecol\twocolumn\else\newpage\fi
}
-+% \changes{v1.7d}{2017/02/15}{bookクラスでtitlepageを必ず奇数ページ
\else
\newenvironment{titlepage}
{%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo 2017-02-21 23:29:27 UTC (rev 43287)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo 2017-02-21 23:29:55 UTC (rev 43288)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk10.clo}
- [2017/02/19 v1.7d-ltj-13
+ [2017/02/20 v1.7d-ltj-14
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
@@ -302,8 +302,6 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-\AtBeginOfPackageFile*{ftnright}{\let\ltjt at orig@@makefntext=\@makefntext}
-\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjtbk10.clo'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo 2017-02-21 23:29:27 UTC (rev 43287)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo 2017-02-21 23:29:55 UTC (rev 43288)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk11.clo}
- [2017/02/19 v1.7d-ltj-13
+ [2017/02/20 v1.7d-ltj-14
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
@@ -302,8 +302,6 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-\AtBeginOfPackageFile*{ftnright}{\let\ltjt at orig@@makefntext=\@makefntext}
-\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjtbk11.clo'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo 2017-02-21 23:29:27 UTC (rev 43287)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo 2017-02-21 23:29:55 UTC (rev 43288)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk12.clo}
- [2017/02/19 v1.7d-ltj-13
+ [2017/02/20 v1.7d-ltj-14
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
@@ -302,8 +302,6 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-\AtBeginOfPackageFile*{ftnright}{\let\ltjt at orig@@makefntext=\@makefntext}
-\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjtbk12.clo'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls 2017-02-21 23:29:27 UTC (rev 43287)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls 2017-02-21 23:29:55 UTC (rev 43288)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtbook}
- [2017/02/19 v1.7d-ltj-13
+ [2017/02/20 v1.7d-ltj-14
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -210,28 +210,14 @@
\renewcommand{\dbltopfraction}{.7}
\renewcommand{\dblfloatpagefraction}{.5}
\def\pltx at cleartorightpage{\clearpage\if at twoside
- \ifodd\c at page
- \iftdir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
- \else
- \ifydir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
+ \unless\ifodd\numexpr\c at page+\ltjgetparameter{direction}\relax
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
\fi\fi}
\def\pltx at cleartoleftpage{\clearpage\if at twoside
- \ifodd\c at page
- \ifydir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
- \else
- \iftdir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
+ \ifodd\numexpr\c at page+\ltjgetparameter{direction}\relax
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
\fi\fi}
\def\pltx at cleartooddpage{\clearpage\if at twoside
\ifodd\c at page\else
@@ -347,7 +333,6 @@
}%
{\if at restonecol\twocolumn\else\newpage\fi
}
-+% \changes{v1.7d}{2017/02/15}{bookクラスでtitlepageを必ず奇数ページ
\else
\newenvironment{titlepage}
{%
@@ -565,7 +550,6 @@
\else
#1\relax
\fi}\nobreak\vskip3\Cvs}
- タイトルより高い位置に右カラムの始点が来るという挙動を維持してあります。
\def\@schapter#1{%
\@makeschapterhead{#1}\@afterheading
}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls 2017-02-21 23:29:27 UTC (rev 43287)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls 2017-02-21 23:29:55 UTC (rev 43288)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtreport}
- [2017/02/19 v1.7d-ltj-13
+ [2017/02/20 v1.7d-ltj-14
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -208,28 +208,14 @@
\renewcommand{\dbltopfraction}{.7}
\renewcommand{\dblfloatpagefraction}{.5}
\def\pltx at cleartorightpage{\clearpage\if at twoside
- \ifodd\c at page
- \iftdir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
- \else
- \ifydir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
+ \unless\ifodd\numexpr\c at page+\ltjgetparameter{direction}\relax
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
\fi\fi}
\def\pltx at cleartoleftpage{\clearpage\if at twoside
- \ifodd\c at page
- \ifydir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
- \else
- \iftdir
- \hbox{}\thispagestyle{empty}\newpage
- \if at twocolumn\hbox{}\newpage\fi
- \fi
+ \ifodd\numexpr\c at page+\ltjgetparameter{direction}\relax
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
\fi\fi}
\def\pltx at cleartooddpage{\clearpage\if at twoside
\ifodd\c at page\else
@@ -336,7 +322,6 @@
}%
{\if at restonecol\twocolumn\else\newpage\fi
}
-+% \changes{v1.7d}{2017/02/15}{bookクラスでtitlepageを必ず奇数ページ
\else
\newenvironment{titlepage}
{%
@@ -559,7 +544,6 @@
\else
#1\relax
\fi}\nobreak\vskip3\Cvs}
- タイトルより高い位置に右カラムの始点が来るという挙動を維持してあります。
\def\@schapter#1{%
\@makeschapterhead{#1}\@afterheading
}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo 2017-02-21 23:29:27 UTC (rev 43287)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo 2017-02-21 23:29:55 UTC (rev 43288)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize10.clo}
- [2017/02/19 v1.7d-ltj-13
+ [2017/02/20 v1.7d-ltj-14
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
@@ -302,8 +302,6 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-\AtBeginOfPackageFile*{ftnright}{\let\ltjt at orig@@makefntext=\@makefntext}
-\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjtsize10.clo'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo 2017-02-21 23:29:27 UTC (rev 43287)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo 2017-02-21 23:29:55 UTC (rev 43288)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize11.clo}
- [2017/02/19 v1.7d-ltj-13
+ [2017/02/20 v1.7d-ltj-14
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
@@ -302,8 +302,6 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-\AtBeginOfPackageFile*{ftnright}{\let\ltjt at orig@@makefntext=\@makefntext}
-\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjtsize11.clo'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo 2017-02-21 23:29:27 UTC (rev 43287)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo 2017-02-21 23:29:55 UTC (rev 43288)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize12.clo}
- [2017/02/19 v1.7d-ltj-13
+ [2017/02/20 v1.7d-ltj-14
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
@@ -302,8 +302,6 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-\AtBeginOfPackageFile*{ftnright}{\let\ltjt at orig@@makefntext=\@makefntext}
-\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjtsize12.clo'.
More information about the tex-live-commits
mailing list