ltjclasses, ltjsclasses: execute \fnbelowfloat automatically if the stfloats package...

diff --git a/doc/ltjclasses.pdf b/doc/ltjclasses.pdf
index c3d6b9c..f0c9643 100644 (file)
Binary files a/doc/ltjclasses.pdf and b/doc/ltjclasses.pdf differ

diff --git a/doc/ltjsclasses.pdf b/doc/ltjsclasses.pdf
index fa75771..59e0a68 100644 (file)
Binary files a/doc/ltjsclasses.pdf and b/doc/ltjsclasses.pdf differ

diff --git a/src/ltj-latex.sty b/src/ltj-latex.sty
index b42157a..1a3c54a 100644 (file)
--- a/src/ltj-latex.sty
+++ b/src/ltj-latex.sty
@@ -62,7 +62,6 @@
 \ltj@pkgpatch{unicode-math}
 \ltj@pkgpatch{xunicode}
 \ltj@pkgpatch{fontspec}
-\ltj@pkgpatch{stfloats}
 \ltj@pkgpatch{footmisc}
 \ltj@pkgpatch{tascmac}
 \ltj@AtBeginDocument{\@ifpackageloaded{ascmac}{%
@@ -70,6 +69,7 @@
   \makeatletter\input{lltjp-tascmac.sty}%
   \ltj@asc@temp\let\ltj@asc@temp=\relax
 }{}}% ascmac
+\ltj@pkgpatch{stfloats}
 
 \RequirePackage{lltjp-geometry}
 \RequirePackage{filehook}

diff --git a/src/ltjarticle.cls b/src/ltjarticle.cls
index ed8dffe..34cd1e3 100644 (file)
--- a/src/ltjarticle.cls
+++ b/src/ltjarticle.cls
@@ -834,6 +834,7 @@
 \pagenumbering{arabic}
 \raggedbottom
 \fnfixbottomtrue % 2017-02-19
+\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{}
 \if@twocolumn
   \twocolumn
   \sloppy
@@ -845,6 +846,8 @@
 \else
   \@mparswitchfalse
 \fi
+\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
 \endinput
 %%
 %% End of file `ltjarticle.cls'.

diff --git a/src/ltjbk10.clo b/src/ltjbk10.clo
index ff2f576..8f8810b 100644 (file)
--- a/src/ltjbk10.clo
+++ b/src/ltjbk10.clo
@@ -294,6 +294,8 @@
 \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/src/ltjbk11.clo b/src/ltjbk11.clo
index fcb183e..17b9420 100644 (file)
--- a/src/ltjbk11.clo
+++ b/src/ltjbk11.clo
@@ -294,6 +294,8 @@
 \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/src/ltjbk12.clo b/src/ltjbk12.clo
index 3a693df..15e55de 100644 (file)
--- a/src/ltjbk12.clo
+++ b/src/ltjbk12.clo
@@ -294,6 +294,8 @@
 \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/src/ltjbook.cls b/src/ltjbook.cls
index 29cac11..5dc346d 100644 (file)
--- a/src/ltjbook.cls
+++ b/src/ltjbook.cls
@@ -941,6 +941,7 @@
 \pagenumbering{arabic}
 \raggedbottom
 \fnfixbottomtrue % 2017-02-19
+\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{}
 \if@twocolumn
   \twocolumn
   \sloppy
@@ -952,6 +953,8 @@
 \else
   \@mparswitchfalse
 \fi
+\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
 \endinput
 %%
 %% End of file `ltjbook.cls'.

diff --git a/src/ltjclasses.dtx b/src/ltjclasses.dtx
index 4630725..495a3a6 100644 (file)
--- a/src/ltjclasses.dtx
+++ b/src/ltjclasses.dtx
@@ -4517,10 +4517,12 @@
 % \end{macro}
 % \end{macro}
 %
+% |stfloats|パッケージがシステムにインストールされている場合は、このパッケージを使って
+% p\LaTeX の標準時と同じようにボトムフロートの下に脚注が組まれるようにします。
 % \changes{v1.0d}{1996/02/29}{articleとreportのデフォルトを
 %                              \pstyle{plain}に修正}
 % \changes{v1.4}{2002/04/09}{縦組スタイルで\cs{flushbottom}しないようにした}
-% \changes{v1.7d-ltj-13}{2017/02/19}{\pLaTeX と\LuaTex-ja の|\@makecol|が違うことを
+% \changes{v1.7d-ltj-13}{2017/02/19}{p\LaTeX とLua\TeX-jaの|\@makecol|が違うことを
 %   考慮していなかった}
 %    \begin{macrocode}
 %<book>\pagestyle{headings}
@@ -4528,6 +4530,7 @@
 \pagenumbering{arabic}
 \raggedbottom
 \fnfixbottomtrue % 2017-02-19
+\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{}
 \if@twocolumn
   \twocolumn
   \sloppy
@@ -4561,7 +4564,7 @@
 % \section{各種パッケージへの対応}
 % もともと縦組での利用を想定されていないいくつかのパッケージについて、
 % 補正するためのコードを記述しておきます。
-% この節のコードは|filehook|パッケージ（\LuaTeX-ja読み込み時に自動でロードされます）
+% この節のコードは|filehook|パッケージ（Lua\TeX-ja読み込み時に自動でロードされます）
 % の機能を用いています。
 %
 % \subsection{\texttt{ftnright}パッケージ}
@@ -4569,10 +4572,8 @@
 % パッケージ読み込み前に予め退避しておき、読み込み後に復帰させます。
 % \changes{v1.7d}{2017/02/19}{コード追加}
 %    \begin{macrocode}
-%<*tate>
 \AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
 \AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
-%</tate>
 %    \end{macrocode}
 %
 %

diff --git a/src/ltjreport.cls b/src/ltjreport.cls
index 80eded0..58594d4 100644 (file)
--- a/src/ltjreport.cls
+++ b/src/ltjreport.cls
@@ -936,6 +936,7 @@
 \pagenumbering{arabic}
 \raggedbottom
 \fnfixbottomtrue % 2017-02-19
+\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{}
 \if@twocolumn
   \twocolumn
   \sloppy
@@ -947,6 +948,8 @@
 \else
   \@mparswitchfalse
 \fi
+\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
 \endinput
 %%
 %% End of file `ltjreport.cls'.

diff --git a/src/ltjsarticle.cls b/src/ltjsarticle.cls
index f4a2b5f..bf867d9 100644 (file)
--- a/src/ltjsarticle.cls
+++ b/src/ltjsarticle.cls
@@ -38,7 +38,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjsarticle}
-  [2017/02/18 ltjsclasses ]
+  [2017/02/19 ltjsclasses ]
 \def\jsc@clsname{ltjsarticle}
 \RequirePackage{luatexja}
 \newif\if@restonecol
@@ -1627,6 +1627,8 @@ class has defined the old font commands like\MessageBreak
 \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
 \if@slide \pagestyle{empty} \else \pagestyle{plain} \fi
 \pagenumbering{arabic}
+\fnfixbottomtrue % 2017-02-19
+\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{}
 \if@twocolumn
   \twocolumn
   \sloppy

diff --git a/src/ltjsbook.cls b/src/ltjsbook.cls
index 9d0cf9e..e48ebfa 100644 (file)
--- a/src/ltjsbook.cls
+++ b/src/ltjsbook.cls
@@ -38,7 +38,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjsbook}
-  [2017/02/18 ltjsclasses ]
+  [2017/02/19 ltjsclasses ]
 \def\jsc@clsname{ltjsbook}
 \RequirePackage{luatexja}
 \newif\if@restonecol
@@ -1713,6 +1713,8 @@ class has defined the old font commands like\MessageBreak
 \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
 \if@report \pagestyle{plain} \else \pagestyle{headings} \fi
 \pagenumbering{arabic}
+\fnfixbottomtrue % 2017-02-19
+\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{}
 \if@twocolumn
   \twocolumn
   \sloppy

diff --git a/src/ltjsclasses.dtx b/src/ltjsclasses.dtx
index bebadd3..f64e930 100644 (file)
--- a/src/ltjsclasses.dtx
+++ b/src/ltjsclasses.dtx
@@ -57,7 +57,7 @@
 %<*driver>
 \ProvidesFile{ltjsclasses.dtx}
 %</driver>
-  [2017/02/18 ltjsclasses ]
+  [2017/02/19 ltjsclasses ]
 %<*driver>
 \IfFileExists{luatex85.sty}{\RequirePackage{luatex85}}{}
 \documentclass{ltjsarticle}
@@ -5523,13 +5523,19 @@
 % \paragraph{ページ設定}
 %
 % ページ設定の初期化です。
+% |stfloats|パッケージがシステムにインストールされている場合は、このパッケージを使って
+% \pLaTeX の標準時と同じようにボトムフロートの下に脚注が組まれるようにします。
 %
+% [2017-02-19] \pLaTeX とLua\TeX-jaの|\@makecol|が違うことを
+%   考慮していませんでした。
 %    \begin{macrocode}
 %<article>\if@slide \pagestyle{empty} \else \pagestyle{plain} \fi
 %<book>\if@report \pagestyle{plain} \else \pagestyle{headings} \fi
 %<report|kiyou>\pagestyle{plain}
 %<jspf>\pagestyle{headings}
 \pagenumbering{arabic}
+\fnfixbottomtrue % 2017-02-19
+\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{}
 \if@twocolumn
   \twocolumn
   \sloppy

diff --git a/src/ltjsize10.clo b/src/ltjsize10.clo
index 1366174..aff439b 100644 (file)
--- a/src/ltjsize10.clo
+++ b/src/ltjsize10.clo
@@ -299,6 +299,8 @@
 \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/src/ltjsize11.clo b/src/ltjsize11.clo
index 2b20287..9d57f59 100644 (file)
--- a/src/ltjsize11.clo
+++ b/src/ltjsize11.clo
@@ -299,6 +299,8 @@
 \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/src/ltjsize12.clo b/src/ltjsize12.clo
index 2ae85a7..6b3f179 100644 (file)
--- a/src/ltjsize12.clo
+++ b/src/ltjsize12.clo
@@ -299,6 +299,8 @@
 \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/src/ltjskiyou.cls b/src/ltjskiyou.cls
index 69a1e28..4063966 100644 (file)
--- a/src/ltjskiyou.cls
+++ b/src/ltjskiyou.cls
@@ -38,7 +38,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjskiyou}
-  [2017/02/18 ltjsclasses ]
+  [2017/02/19 ltjsclasses ]
 \def\jsc@clsname{ltjskiyou}
 \RequirePackage{luatexja}
 \newif\if@restonecol
@@ -1612,6 +1612,8 @@ class has defined the old font commands like\MessageBreak
 \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
 \pagestyle{plain}
 \pagenumbering{arabic}
+\fnfixbottomtrue % 2017-02-19
+\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{}
 \if@twocolumn
   \twocolumn
   \sloppy

diff --git a/src/ltjspf.cls b/src/ltjspf.cls
index f1d5380..42e05ea 100644 (file)
--- a/src/ltjspf.cls
+++ b/src/ltjspf.cls
@@ -38,7 +38,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjspf}
-  [2017/02/18 ltjsclasses ]
+  [2017/02/19 ltjsclasses ]
 \def\jsc@clsname{ltjspf}
 \RequirePackage{luatexja}
 \newif\if@restonecol
@@ -1506,6 +1506,8 @@ class has defined the old font commands like\MessageBreak
 \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
 \pagestyle{headings}
 \pagenumbering{arabic}
+\fnfixbottomtrue % 2017-02-19
+\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{}
 \if@twocolumn
   \twocolumn
   \sloppy

diff --git a/src/ltjsreport.cls b/src/ltjsreport.cls
index 83e8832..2e96771 100644 (file)
--- a/src/ltjsreport.cls
+++ b/src/ltjsreport.cls
@@ -38,7 +38,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjsreport}
-  [2017/02/18 ltjsclasses ]
+  [2017/02/19 ltjsclasses ]
 \def\jsc@clsname{ltjsreport}
 \RequirePackage{luatexja}
 \newif\if@restonecol
@@ -1705,6 +1705,8 @@ class has defined the old font commands like\MessageBreak
 \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
 \pagestyle{plain}
 \pagenumbering{arabic}
+\fnfixbottomtrue % 2017-02-19
+\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{}
 \if@twocolumn
   \twocolumn
   \sloppy

diff --git a/src/ltjtarticle.cls b/src/ltjtarticle.cls
index c011492..0d46ff7 100644 (file)
--- a/src/ltjtarticle.cls
+++ b/src/ltjtarticle.cls
@@ -849,6 +849,7 @@
 \pagenumbering{arabic}
 \raggedbottom
 \fnfixbottomtrue % 2017-02-19
+\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{}
 \if@twocolumn
   \twocolumn
   \sloppy

diff --git a/src/ltjtbook.cls b/src/ltjtbook.cls
index 189647e..82887ba 100644 (file)
--- a/src/ltjtbook.cls
+++ b/src/ltjtbook.cls
@@ -956,6 +956,7 @@
 \pagenumbering{arabic}
 \raggedbottom
 \fnfixbottomtrue % 2017-02-19
+\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{}
 \if@twocolumn
   \twocolumn
   \sloppy

diff --git a/src/ltjtreport.cls b/src/ltjtreport.cls
index bdd5baa..413be7d 100644 (file)
--- a/src/ltjtreport.cls
+++ b/src/ltjtreport.cls
@@ -951,6 +951,7 @@
 \pagenumbering{arabic}
 \raggedbottom
 \fnfixbottomtrue % 2017-02-19
+\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{}
 \if@twocolumn
   \twocolumn
   \sloppy

diff --git a/src/patches/lltjcore.sty b/src/patches/lltjcore.sty
index 6a9b4f8..9c49367 100644 (file)
--- a/src/patches/lltjcore.sty
+++ b/src/patches/lltjcore.sty
@@ -267,7 +267,7 @@
    \else
      \setbox\@outputbox \vbox to\@colht {%
        \@texttop
-       \dimen@ \dp\@outputbox\typeout{\the\dimen@,\meaning\@textbottom}
+       \dimen@ \dp\@outputbox
        \unvbox \@outputbox
        \ifnum\ltjgetparameter{direction}=4\else\vbox{\hskip\z@}\fi %%% LuaTeX-ja
        \vskip -\dimen@
@@ -276,6 +276,7 @@
    \fi
    \global \maxdepth \@maxdepth
 }
+\let\ltj@orig@makecol=\@makecol
 
 \patchcmd\@makespecialcolbox{\@textbottom}{\ifltj@ftn@unvboxed\iffnfixbottom\else\@textbottom\fi\else\@textbottom\fi}{}{}
 

diff --git a/src/patches/lltjp-stfloats.sty b/src/patches/lltjp-stfloats.sty
index b5ff2a3..9a28df5 100644 (file)
--- a/src/patches/lltjp-stfloats.sty
+++ b/src/patches/lltjp-stfloats.sty
@@ -8,7 +8,11 @@
 \RequirePackage{stfloats,luatexja}
 \RequirePackage{etoolbox}
 
+\newif\ifltj@stfloats@fnbelowfloat
 \let\ltj@fn@makecol=\fn@makecol
+\ifx\@makecol\ltj@fn@makecol\ltj@stfloats@fnbelowfloattrue\fi % \fnbelowfloat 発行済
+\let\ltj@fn@makecol=\relax
+\global\let\org@makecol\ltj@orig@makecol
 
 \patchcmd\fn@makecol{\vskip -\dimen@\@textbottom}%
   {\ifnum\ltjgetparameter{direction}=4\else\vbox{\hskip\z@}\fi %%% LuaTeX-ja
@@ -18,7 +22,7 @@
 \patchcmd\fn@makecol{\ifvoid\footins}{\ifvoid\footins\ltj@ftn@unvboxedfalse}{}{}
 \patchcmd\fn@makecol{\setbox\@outputbox \vbox}{\ltj@ftn@unvboxedtrue\setbox\@outputbox \vbox}{}{}
 
-\ifx\@makecol\ltj@fn@makecol
+\ifltj@stfloats@fnbelowfloat
   \global\let\@makecol\fn@makecol
 \fi
 \endinput