diff options
Diffstat (limited to 'Master/texmf-dist/tex/luatex')
19 files changed, 61 insertions, 177 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty b/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty index 1da5aadcfcd..7a445f5d7d5 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty @@ -36,7 +36,7 @@ \def\p@array<#1>[#2]#3{% \let\box@dir\relax \if #1z\relax - \ifnum\ltjgetparameter{direction}=3\relax + \ifnum\count@=3\relax \let\box@dir\utod\@tempcnta=\zstrutbox \fi \else @@ -688,7 +688,7 @@ %%% references \def\@eqnnum{{\reset@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@lltjext@patch@array{% + \patchcmd{\@tabular}{\hbox\bgroup}{% + \hbox\bgroup\count@=\ltjgetparameter{direction}}{}{} \def\@startpbox##1{\bgroup \box@dir\adjustbaseline%%% これを追加 \hsize=##1\@arrayparboxrestore @@ -707,7 +709,7 @@ \def\p@array<##1>[##2]##3{% \let\box@dir\relax \if ##1z\relax - \ifnum\ltjgetparameter{direction}=3\relax + \ifnum\count@=3\relax \let\box@dir\utod\@tempcnta=\zstrutbox \fi \else @@ -722,7 +724,7 @@ \fi\fi\fi\fi \fi \ifx\box@dir\relax - \ifcase\ltjgetparameter{direction} + \ifcase\count@ \or \let\box@dir\dtou\@tempcnta=\tabskip \z@\tabskip \z@\dstrutbox% dtou \or\or\let\box@dir\tate\@tempcnta=\tstrutbox% tate \or \let\box@dir\yoko\@tempcnta=\strutbox% yoko @@ -759,7 +761,7 @@ \let\ltj@lltjext@orig@tabularS\relax \let\ltj@lltjext@orig@tabular\relax \let\ltj@lltjext@orig@array\relax - \RequirePackage{filehook} + \RequirePackage{filehook,etoolbox} \AtEndOfPackageFile{array}{\ltj@lltjext@patch@array} } diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls index 34cd1e31035..3e1f0d53350 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls @@ -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@cleartorightpage{\clearpage\if@twoside - \ifodd\c@page - \iftdir - \hbox{}\thispagestyle{empty}\newpage - \if@twocolumn\hbox{}\newpage\fi - \fi - \else - \ifydir - \hbox{}\thispagestyle{empty}\newpage - \if@twocolumn\hbox{}\newpage\fi - \fi + \unless\ifodd\numexpr\c@page+\ltjgetparameter{direction}\relax + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi \fi\fi} \def\pltx@cleartoleftpage{\clearpage\if@twoside - \ifodd\c@page - \ifydir - \hbox{}\thispagestyle{empty}\newpage - \if@twocolumn\hbox{}\newpage\fi - \fi - \else - \iftdir - \hbox{}\thispagestyle{empty}\newpage - \if@twocolumn\hbox{}\newpage\fi - \fi + \ifodd\numexpr\c@page+\ltjgetparameter{direction}\relax + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi \fi\fi} \def\pltx@cleartooddpage{\clearpage\if@twoside \ifodd\c@page\else @@ -303,7 +289,6 @@ }% {\if@restonecol\twocolumn\else\newpage\fi } -+% \changes{v1.7d}{2017/02/15}{bookクラスでtitlepageを必ず奇数ページ \else \newenvironment{titlepage} {% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo index 8f8810b364e..5e8258bc0ab 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo @@ -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@orig@@makefntext=\@makefntext} -\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjbk10.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo index 17b94201400..adb5c1a7876 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo @@ -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@orig@@makefntext=\@makefntext} -\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjbk11.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo index 15e55de1b00..73424e5faf7 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo @@ -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@orig@@makefntext=\@makefntext} -\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjbk12.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls index 5dc346d18c8..52c5b2ca9f9 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls @@ -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@cleartorightpage{\clearpage\if@twoside - \ifodd\c@page - \iftdir - \hbox{}\thispagestyle{empty}\newpage - \if@twocolumn\hbox{}\newpage\fi - \fi - \else - \ifydir - \hbox{}\thispagestyle{empty}\newpage - \if@twocolumn\hbox{}\newpage\fi - \fi + \unless\ifodd\numexpr\c@page+\ltjgetparameter{direction}\relax + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi \fi\fi} \def\pltx@cleartoleftpage{\clearpage\if@twoside - \ifodd\c@page - \ifydir - \hbox{}\thispagestyle{empty}\newpage - \if@twocolumn\hbox{}\newpage\fi - \fi - \else - \iftdir - \hbox{}\thispagestyle{empty}\newpage - \if@twocolumn\hbox{}\newpage\fi - \fi + \ifodd\numexpr\c@page+\ltjgetparameter{direction}\relax + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi \fi\fi} \def\pltx@cleartooddpage{\clearpage\if@twoside \ifodd\c@page\else @@ -335,7 +321,6 @@ }% {\if@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 } diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls index 58594d460a6..f2ec93da18b 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls @@ -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@cleartorightpage{\clearpage\if@twoside - \ifodd\c@page - \iftdir - \hbox{}\thispagestyle{empty}\newpage - \if@twocolumn\hbox{}\newpage\fi - \fi - \else - \ifydir - \hbox{}\thispagestyle{empty}\newpage - \if@twocolumn\hbox{}\newpage\fi - \fi + \unless\ifodd\numexpr\c@page+\ltjgetparameter{direction}\relax + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi \fi\fi} \def\pltx@cleartoleftpage{\clearpage\if@twoside - \ifodd\c@page - \ifydir - \hbox{}\thispagestyle{empty}\newpage - \if@twocolumn\hbox{}\newpage\fi - \fi - \else - \iftdir - \hbox{}\thispagestyle{empty}\newpage - \if@twocolumn\hbox{}\newpage\fi - \fi + \ifodd\numexpr\c@page+\ltjgetparameter{direction}\relax + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi \fi\fi} \def\pltx@cleartooddpage{\clearpage\if@twoside \ifodd\c@page\else @@ -324,7 +310,6 @@ }% {\if@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 } diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo index aff439b0d4c..dc09458301a 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo @@ -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@orig@@makefntext=\@makefntext} -\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjsize10.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo index 9d57f599923..71ba0bd9513 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo @@ -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@orig@@makefntext=\@makefntext} -\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjsize11.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo index 6b3f1799760..08febe4afec 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo @@ -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@orig@@makefntext=\@makefntext} -\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjsize12.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls index 0d46ff79a1f..9fcf3df716e 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls @@ -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@cleartorightpage{\clearpage\if@twoside - \ifodd\c@page - \iftdir - \hbox{}\thispagestyle{empty}\newpage - \if@twocolumn\hbox{}\newpage\fi - \fi - \else - \ifydir - \hbox{}\thispagestyle{empty}\newpage - \if@twocolumn\hbox{}\newpage\fi - \fi + \unless\ifodd\numexpr\c@page+\ltjgetparameter{direction}\relax + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi \fi\fi} \def\pltx@cleartoleftpage{\clearpage\if@twoside - \ifodd\c@page - \ifydir - \hbox{}\thispagestyle{empty}\newpage - \if@twocolumn\hbox{}\newpage\fi - \fi - \else - \iftdir - \hbox{}\thispagestyle{empty}\newpage - \if@twocolumn\hbox{}\newpage\fi - \fi + \ifodd\numexpr\c@page+\ltjgetparameter{direction}\relax + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi \fi\fi} \def\pltx@cleartooddpage{\clearpage\if@twoside \ifodd\c@page\else @@ -315,7 +301,6 @@ }% {\if@restonecol\twocolumn\else\newpage\fi } -+% \changes{v1.7d}{2017/02/15}{bookクラスでtitlepageを必ず奇数ページ \else \newenvironment{titlepage} {% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo index 1a10e26650b..89ed288cd45 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo @@ -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@orig@@makefntext=\@makefntext} -\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjtbk10.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo index f5a5fc03efe..8d72f842018 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo @@ -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@orig@@makefntext=\@makefntext} -\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjtbk11.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo index c150739d5e8..9543641fbe6 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo @@ -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@orig@@makefntext=\@makefntext} -\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjtbk12.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls index 82887bafba8..7ae6e197202 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls @@ -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@cleartorightpage{\clearpage\if@twoside - \ifodd\c@page - \iftdir - \hbox{}\thispagestyle{empty}\newpage - \if@twocolumn\hbox{}\newpage\fi - \fi - \else - \ifydir - \hbox{}\thispagestyle{empty}\newpage - \if@twocolumn\hbox{}\newpage\fi - \fi + \unless\ifodd\numexpr\c@page+\ltjgetparameter{direction}\relax + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi \fi\fi} \def\pltx@cleartoleftpage{\clearpage\if@twoside - \ifodd\c@page - \ifydir - \hbox{}\thispagestyle{empty}\newpage - \if@twocolumn\hbox{}\newpage\fi - \fi - \else - \iftdir - \hbox{}\thispagestyle{empty}\newpage - \if@twocolumn\hbox{}\newpage\fi - \fi + \ifodd\numexpr\c@page+\ltjgetparameter{direction}\relax + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi \fi\fi} \def\pltx@cleartooddpage{\clearpage\if@twoside \ifodd\c@page\else @@ -347,7 +333,6 @@ }% {\if@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 } diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls index 413be7d480b..2aaab6cd1a3 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls @@ -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@cleartorightpage{\clearpage\if@twoside - \ifodd\c@page - \iftdir - \hbox{}\thispagestyle{empty}\newpage - \if@twocolumn\hbox{}\newpage\fi - \fi - \else - \ifydir - \hbox{}\thispagestyle{empty}\newpage - \if@twocolumn\hbox{}\newpage\fi - \fi + \unless\ifodd\numexpr\c@page+\ltjgetparameter{direction}\relax + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi \fi\fi} \def\pltx@cleartoleftpage{\clearpage\if@twoside - \ifodd\c@page - \ifydir - \hbox{}\thispagestyle{empty}\newpage - \if@twocolumn\hbox{}\newpage\fi - \fi - \else - \iftdir - \hbox{}\thispagestyle{empty}\newpage - \if@twocolumn\hbox{}\newpage\fi - \fi + \ifodd\numexpr\c@page+\ltjgetparameter{direction}\relax + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi \fi\fi} \def\pltx@cleartooddpage{\clearpage\if@twoside \ifodd\c@page\else @@ -336,7 +322,6 @@ }% {\if@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 } diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo index 8fca8ffe464..41c2c73b550 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo @@ -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@orig@@makefntext=\@makefntext} -\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjtsize10.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo index 8b14902abbe..fd34a3176c7 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo @@ -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@orig@@makefntext=\@makefntext} -\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjtsize11.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo index 4760f40cbb0..0cbabf39348 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo @@ -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@orig@@makefntext=\@makefntext} -\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjtsize12.clo'. |