Fix #37004 (maybe)

diff --git a/src/ltjarticle.cls b/src/ltjarticle.cls
index 40732e9..ed8dffe 100644 (file)
--- a/src/ltjarticle.cls
+++ b/src/ltjarticle.cls
@@ -23,7 +23,7 @@
 %% File: ltjclasses.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjarticle}
-  [2017/02/15 v1.7d-ltj-12
+  [2017/02/19 v1.7d-ltj-13
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}
@@ -833,6 +833,7 @@
 \pagestyle{plain}
 \pagenumbering{arabic}
 \raggedbottom
+\fnfixbottomtrue % 2017-02-19
 \if@twocolumn
   \twocolumn
   \sloppy

diff --git a/src/ltjbk10.clo b/src/ltjbk10.clo
index 0c84fca..ff2f576 100644 (file)
--- a/src/ltjbk10.clo
+++ b/src/ltjbk10.clo
@@ -23,7 +23,7 @@
 %% File: ltjclasses.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjbk10.clo}
-  [2017/02/15 v1.7d-ltj-12
+  [2017/02/19 v1.7d-ltj-13
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{15}%

diff --git a/src/ltjbk11.clo b/src/ltjbk11.clo
index b7f9397..fcb183e 100644 (file)
--- a/src/ltjbk11.clo
+++ b/src/ltjbk11.clo
@@ -23,7 +23,7 @@
 %% File: ltjclasses.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjbk11.clo}
-  [2017/02/15 v1.7d-ltj-12
+  [2017/02/19 v1.7d-ltj-13
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{15.5}%

diff --git a/src/ltjbk12.clo b/src/ltjbk12.clo
index ca9fa1d..3a693df 100644 (file)
--- a/src/ltjbk12.clo
+++ b/src/ltjbk12.clo
@@ -23,7 +23,7 @@
 %% File: ltjclasses.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjbk12.clo}
-  [2017/02/15 v1.7d-ltj-12
+  [2017/02/19 v1.7d-ltj-13
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{16.5}%

diff --git a/src/ltjbook.cls b/src/ltjbook.cls
index 56658e7..29cac11 100644 (file)
--- a/src/ltjbook.cls
+++ b/src/ltjbook.cls
@@ -23,7 +23,7 @@
 %% File: ltjclasses.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjbook}
-  [2017/02/15 v1.7d-ltj-12
+  [2017/02/19 v1.7d-ltj-13
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}
@@ -940,6 +940,7 @@
 \pagestyle{headings}
 \pagenumbering{arabic}
 \raggedbottom
+\fnfixbottomtrue % 2017-02-19
 \if@twocolumn
   \twocolumn
   \sloppy

diff --git a/src/ltjclasses.dtx b/src/ltjclasses.dtx
index 9d8d760..4630725 100644 (file)
--- a/src/ltjclasses.dtx
+++ b/src/ltjclasses.dtx
@@ -103,6 +103,8 @@
 % \changes{v1.7d}{2017/02/15}{titlepageのページ番号を奇数ならば1に、
 %   偶数ならば0にリセットするように変更}
 % \changes{v1.7d}{2017/02/15}{縦組クラスの所属表示の番号を直立にした}
+% \changes{v1.7d-ltj-13}{2017/02/19}{縦組時クラスで|ftnright|パッケージを使うと
+%   脚注番号が上書きされ横に寝てしまう問題を修正（aminophenさん，ありがとうございます）．}
 % \fi
 %
 % \iffalse
@@ -132,7 +134,7 @@
 %<11pt&bk>\ProvidesFile{ltjtbk11.clo}
 %<12pt&bk>\ProvidesFile{ltjtbk12.clo}
 %</tate>
-  [2017/02/15 v1.7d-ltj-12
+  [2017/02/19 v1.7d-ltj-13
 %<article|report|book> Standard LuaLaTeX-ja class]
 %<10pt|11pt|12pt>  Standard LuaLaTeX-ja file (size option)]
 %<*driver>
@@ -4518,11 +4520,14 @@
 % \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|が違うことを
+%   考慮していなかった}
 %    \begin{macrocode}
 %<book>\pagestyle{headings}
 %<!book>\pagestyle{plain}
 \pagenumbering{arabic}
 \raggedbottom
+\fnfixbottomtrue % 2017-02-19
 \if@twocolumn
   \twocolumn
   \sloppy
@@ -4553,6 +4558,22 @@
 %</article|report|book>
 %    \end{macrocode}
 %
+% \section{各種パッケージへの対応}
+% もともと縦組での利用を想定されていないいくつかのパッケージについて、
+% 補正するためのコードを記述しておきます。
+% この節のコードは|filehook|パッケージ（\LuaTeX-ja読み込み時に自動でロードされます）
+% の機能を用いています。
+%
+% \subsection{\texttt{ftnright}パッケージ}
+% 脚注番号の書式が|ftnright|パッケージによって勝手に書き換えられるので、
+% パッケージ読み込み前に予め退避しておき、読み込み後に復帰させます。
+% \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}
 %
 %
 % \Finale

diff --git a/src/ltjreport.cls b/src/ltjreport.cls
index 68e6164..80eded0 100644 (file)
--- a/src/ltjreport.cls
+++ b/src/ltjreport.cls
@@ -23,7 +23,7 @@
 %% File: ltjclasses.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjreport}
-  [2017/02/15 v1.7d-ltj-12
+  [2017/02/19 v1.7d-ltj-13
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}
@@ -935,6 +935,7 @@
 \pagestyle{plain}
 \pagenumbering{arabic}
 \raggedbottom
+\fnfixbottomtrue % 2017-02-19
 \if@twocolumn
   \twocolumn
   \sloppy

diff --git a/src/ltjsize10.clo b/src/ltjsize10.clo
index 2c52aed..1366174 100644 (file)
--- a/src/ltjsize10.clo
+++ b/src/ltjsize10.clo
@@ -23,7 +23,7 @@
 %% File: ltjclasses.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjsize10.clo}
-  [2017/02/15 v1.7d-ltj-12
+  [2017/02/19 v1.7d-ltj-13
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{15}%

diff --git a/src/ltjsize11.clo b/src/ltjsize11.clo
index 85f8094..2b20287 100644 (file)
--- a/src/ltjsize11.clo
+++ b/src/ltjsize11.clo
@@ -23,7 +23,7 @@
 %% File: ltjclasses.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjsize11.clo}
-  [2017/02/15 v1.7d-ltj-12
+  [2017/02/19 v1.7d-ltj-13
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{15.5}%

diff --git a/src/ltjsize12.clo b/src/ltjsize12.clo
index 8da44b5..2ae85a7 100644 (file)
--- a/src/ltjsize12.clo
+++ b/src/ltjsize12.clo
@@ -23,7 +23,7 @@
 %% File: ltjclasses.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjsize12.clo}
-  [2017/02/15 v1.7d-ltj-12
+  [2017/02/19 v1.7d-ltj-13
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{16.5}%

diff --git a/src/ltjtarticle.cls b/src/ltjtarticle.cls
index 199131b..c011492 100644 (file)
--- a/src/ltjtarticle.cls
+++ b/src/ltjtarticle.cls
@@ -23,7 +23,7 @@
 %% File: ltjclasses.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjtarticle}
-  [2017/02/15 v1.7d-ltj-12
+  [2017/02/19 v1.7d-ltj-13
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}
@@ -848,6 +848,7 @@
 \pagestyle{plain}
 \pagenumbering{arabic}
 \raggedbottom
+\fnfixbottomtrue % 2017-02-19
 \if@twocolumn
   \twocolumn
   \sloppy
@@ -856,6 +857,8 @@
 \fi
 \normalmarginpar
 \@mparswitchfalse
+\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
 \endinput
 %%
 %% End of file `ltjtarticle.cls'.

diff --git a/src/ltjtbk10.clo b/src/ltjtbk10.clo
index bf18eb7..1a10e26 100644 (file)
--- a/src/ltjtbk10.clo
+++ b/src/ltjtbk10.clo
@@ -23,7 +23,7 @@
 %% File: ltjclasses.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjtbk10.clo}
-  [2017/02/15 v1.7d-ltj-12
+  [2017/02/19 v1.7d-ltj-13
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{17}%
@@ -302,6 +302,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 `ltjtbk10.clo'.

diff --git a/src/ltjtbk11.clo b/src/ltjtbk11.clo
index 714ed5d..f5a5fc0 100644 (file)
--- a/src/ltjtbk11.clo
+++ b/src/ltjtbk11.clo
@@ -23,7 +23,7 @@
 %% File: ltjclasses.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjtbk11.clo}
-  [2017/02/15 v1.7d-ltj-12
+  [2017/02/19 v1.7d-ltj-13
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{17}%
@@ -302,6 +302,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 `ltjtbk11.clo'.

diff --git a/src/ltjtbk12.clo b/src/ltjtbk12.clo
index 80f97b9..c150739 100644 (file)
--- a/src/ltjtbk12.clo
+++ b/src/ltjtbk12.clo
@@ -23,7 +23,7 @@
 %% File: ltjclasses.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjtbk12.clo}
-  [2017/02/15 v1.7d-ltj-12
+  [2017/02/19 v1.7d-ltj-13
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{18}%
@@ -302,6 +302,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 `ltjtbk12.clo'.

diff --git a/src/ltjtbook.cls b/src/ltjtbook.cls
index 4e948c6..189647e 100644 (file)
--- a/src/ltjtbook.cls
+++ b/src/ltjtbook.cls
@@ -23,7 +23,7 @@
 %% File: ltjclasses.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjtbook}
-  [2017/02/15 v1.7d-ltj-12
+  [2017/02/19 v1.7d-ltj-13
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}
@@ -955,6 +955,7 @@
 \pagestyle{headings}
 \pagenumbering{arabic}
 \raggedbottom
+\fnfixbottomtrue % 2017-02-19
 \if@twocolumn
   \twocolumn
   \sloppy
@@ -963,6 +964,8 @@
 \fi
 \normalmarginpar
 \@mparswitchfalse
+\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
 \endinput
 %%
 %% End of file `ltjtbook.cls'.

diff --git a/src/ltjtreport.cls b/src/ltjtreport.cls
index fa9bb9b..bdd5baa 100644 (file)
--- a/src/ltjtreport.cls
+++ b/src/ltjtreport.cls
@@ -23,7 +23,7 @@
 %% File: ltjclasses.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjtreport}
-  [2017/02/15 v1.7d-ltj-12
+  [2017/02/19 v1.7d-ltj-13
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}
@@ -950,6 +950,7 @@
 \pagestyle{plain}
 \pagenumbering{arabic}
 \raggedbottom
+\fnfixbottomtrue % 2017-02-19
 \if@twocolumn
   \twocolumn
   \sloppy
@@ -958,6 +959,8 @@
 \fi
 \normalmarginpar
 \@mparswitchfalse
+\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
 \endinput
 %%
 %% End of file `ltjtreport.cls'.

diff --git a/src/ltjtsize10.clo b/src/ltjtsize10.clo
index a1d01ef..8fca8ff 100644 (file)
--- a/src/ltjtsize10.clo
+++ b/src/ltjtsize10.clo
@@ -23,7 +23,7 @@
 %% File: ltjclasses.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjtsize10.clo}
-  [2017/02/15 v1.7d-ltj-12
+  [2017/02/19 v1.7d-ltj-13
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{17}%
@@ -302,6 +302,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 `ltjtsize10.clo'.

diff --git a/src/ltjtsize11.clo b/src/ltjtsize11.clo
index a0ec23a..8b14902 100644 (file)
--- a/src/ltjtsize11.clo
+++ b/src/ltjtsize11.clo
@@ -23,7 +23,7 @@
 %% File: ltjclasses.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjtsize11.clo}
-  [2017/02/15 v1.7d-ltj-12
+  [2017/02/19 v1.7d-ltj-13
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{17}%
@@ -302,6 +302,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 `ltjtsize11.clo'.

diff --git a/src/ltjtsize12.clo b/src/ltjtsize12.clo
index 8c5a76f..4760f40 100644 (file)
--- a/src/ltjtsize12.clo
+++ b/src/ltjtsize12.clo
@@ -23,7 +23,7 @@
 %% File: ltjclasses.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjtsize12.clo}
-  [2017/02/15 v1.7d-ltj-12
+  [2017/02/19 v1.7d-ltj-13
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{18}%
@@ -302,6 +302,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 `ltjtsize12.clo'.

diff --git a/src/patches/lltjcore.sty b/src/patches/lltjcore.sty
index f632fe8..2d31dcd 100644 (file)
--- a/src/patches/lltjcore.sty
+++ b/src/patches/lltjcore.sty
@@ -4,7 +4,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjcore}[2016/05/05 Patch to LaTeX2e Kernel for LuaTeX-ja]
+\ProvidesPackage{lltjcore}[2017/02/19 Patch to LaTeX2e Kernel for LuaTeX-ja]
 
 \def\cleardoublepage{\clearpage\if@twoside
   \ifodd\c@page
@@ -237,14 +237,19 @@
     \vbox{\yoko\unvbox \@begindvibox #1}%
 }
 
+\newif\iffnfixbottom
+\newif\ifltj@ftn@unvboxed
 %%% @makecol
 \gdef \@makecol {%
    \ifvoid\footins
+     \ltj@ftn@unvboxedfalse
      \setbox\@outputbox \box\@cclv
    \else
+     \ltj@ftn@unvboxedtrue
      \setbox\@outputbox \vbox {%
        \boxmaxdepth \@maxdepth
        \unvbox \@cclv
+       \iffnfixbottom\vskip\z@ \@plus.0001fil\fi
        \vskip \skip\footins
        \color@begingroup
          \normalcolor
@@ -262,16 +267,20 @@
    \else
      \setbox\@outputbox \vbox to\@colht {%
        \@texttop
-       \dimen@ \dp\@outputbox
+       \dimen@ \dp\@outputbox\typeout{\the\dimen@,\meaning\@textbottom}
        \unvbox \@outputbox
        \ifnum\ltjgetparameter{direction}=4\else\vbox{\hskip\z@}\fi %%% LuaTeX-ja
        \vskip -\dimen@
-       \@textbottom
+       \ifltj@ftn@unvboxed\iffnfixbottom\else\@textbottom\fi\else\@textbottom\fi
        }%
+    {\scrollmode\showboxdepth1\showboxbreadth10000
+     \tracingonline1\showbox\@outputbox\errorstopmode}
    \fi
    \global \maxdepth \@maxdepth
 }
 
+\patchcmd\@makespecialcolbox{\@textbottom}{\ifltj@ftn@unvboxed\iffnfixbottom\else\@textbottom\fi\else\@textbottom\fi}{}{}
+
 \def\@gnewline #1{%
   \ifvmode
     \@nolnerr

diff --git a/src/patches/lltjp-stfloats.sty b/src/patches/lltjp-stfloats.sty
index 794db15..b5ff2a3 100644 (file)
--- a/src/patches/lltjp-stfloats.sty
+++ b/src/patches/lltjp-stfloats.sty
@@ -3,16 +3,20 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-stfloats}[2017/01/19 Patch to stfloats for LuaTeX-ja]
+\ProvidesPackage{lltjp-stfloats}[2017/02/19 Patch to stfloats for LuaTeX-ja]
 
 \RequirePackage{stfloats,luatexja}
 \RequirePackage{etoolbox}
 
 \let\ltj@fn@makecol=\fn@makecol
 
-\patchcmd\fn@makecol{\vskip -\dimen@}%
+\patchcmd\fn@makecol{\vskip -\dimen@\@textbottom}%
   {\ifnum\ltjgetparameter{direction}=4\else\vbox{\hskip\z@}\fi %%% LuaTeX-ja
-   \vskip -\dimen@}{}{}
+   \vskip -\dimen@
+   \ifltj@ftn@unvboxed\iffnfixbottom\else\@textbottom\fi\else\@textbottom\fi}{}{}
+\patchcmd\fn@makecol{\vskip\skip\footins}{\iffnfixbottom\vskip\z@\@plus.0001fil\fi\vskip\skip\footins}{}{}
+\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
   \global\let\@makecol\fn@makecol