Fix ticket #34636

diff --git a/src/ltj-latex.sty b/src/ltj-latex.sty
index 6aa8bfd..d4059c2 100644 (file)
--- a/src/ltj-latex.sty
+++ b/src/ltj-latex.sty
@@ -63,6 +63,7 @@
 \ltj@pkgpatch{xunicode}
 \ltj@pkgpatch{fontspec}
 \ltj@pkgpatch{stfloats}
+\ltj@pkgpatch{footmisc}
 \RequirePackage{lltjp-geometry}
 
 

diff --git a/src/patches/lltjcore.sty b/src/patches/lltjcore.sty
index 1de58cf..7cc4dd2 100644 (file)
--- a/src/patches/lltjcore.sty
+++ b/src/patches/lltjcore.sty
@@ -219,4 +219,39 @@
     \vbox{\yoko\unvbox \@begindvibox #1}%
 }
 
+%%% @makecol
+\gdef \@makecol {%
+   \ifvoid\footins
+     \setbox\@outputbox \box\@cclv
+   \else
+     \setbox\@outputbox \vbox {%
+       \boxmaxdepth \@maxdepth
+       \unvbox \@cclv
+       \vskip \skip\footins
+       \color@begingroup
+         \normalcolor
+         \footnoterule
+         \unvbox \footins
+       \color@endgroup
+       }%
+   \fi
+   \let\@elt\relax
+   \xdef\@freelist{\@freelist\@midlist}%
+   \global \let \@midlist \@empty
+   \@combinefloats
+   \ifvbox\@kludgeins
+     \@makespecialcolbox
+   \else
+     \setbox\@outputbox \vbox to\@colht {%
+       \@texttop
+       \dimen@ \dp\@outputbox
+       \unvbox \@outputbox
+       \ifnum\ltjgetparameter{direction}=3 \hskip\z@\fi %%% LuaTeX-ja
+       \vskip -\dimen@
+       \@textbottom
+       }%
+   \fi
+   \global \maxdepth \@maxdepth
+}
+
 \endinput

diff --git a/src/patches/lltjp-footmisc.sty b/src/patches/lltjp-footmisc.sty
new file mode 100644 (file)
index 0000000..d712554
--- /dev/null
+++ b/src/patches/lltjp-footmisc.sty
@@ -0,0 +1,58 @@
+%
+% lltjp-footmiscs.sty
+%
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{lltjp-footmisc}[2014/11/23 Patch to footmisc for LuaTeX-ja]
+\RequirePackage{footmisc}
+
+\let  \if@tempswa  \ifFN@bottom
+\ifFN@para    \@tempswatrue \fi
+\if@tempswa
+  \ifFN@bottom
+    \toks@{\setbox\@outputbox \box\@cclv
+      \xdef\@freelist{\@freelist\@midlist}%
+      \global\let\@midlist\@empty
+      \@combinefloats
+      \ifvoid\footins
+      \else
+        \setbox\@outputbox \vbox\bgroup
+          \boxmaxdepth\@maxdepth
+          \unvbox\@outputbox
+          \vfill\relax
+    }
+    \the\FN@temptoken
+    \toks@\expandafter{\the\toks@\egroup\fi}
+  \else
+    \toks@{\ifvoid\footins
+        \setbox\@outputbox\box\@cclv
+      \else
+        \setbox\@outputbox \vbox\bgroup
+        \boxmaxdepth\@maxdepth
+        \unvbox\@cclv
+    }
+    \the\FN@temptoken
+    \toks@\expandafter{\the\toks@
+      \egroup
+      \fi
+      \xdef\@freelist{\@freelist\@midlist}%
+      \global\let\@midlist\@empty
+      \@combinefloats
+    }%
+  \fi
+  \toks@\expandafter{\the\toks@
+    \ifvbox\@kludgeins
+      \@makespecialcolbox
+    \else
+      \setbox\@outputbox \vbox to\@colht{%
+        \@texttop \dimen@\dp\@outputbox
+        \unvbox\@outputbox
+        \ifnum\ltjgetparameter{direction}=3 \hskip\z@\fi %%% LuaTeX-ja
+        \vskip -\dimen@\@textbottom
+      }%
+    \fi
+    \global\maxdepth\@maxdepth
+  }
+  \edef\@makecol{\the\toks@}
+\fi
+\endinput
\ No newline at end of file

diff --git a/src/patches/lltjp-geometry.sty b/src/patches/lltjp-geometry.sty
index a34a767..b959ed2 100644 (file)
--- a/src/patches/lltjp-geometry.sty
+++ b/src/patches/lltjp-geometry.sty
@@ -6,6 +6,7 @@
 \ProvidesPackage{lltjp-geometry}[2014/11/23 Patch to geometry for LuaTeX-ja with vertical writing mode]
 \RequirePackage{ifluatex}
 
+\newdimen\ltj@@geometry@topskip@backup
 \newif\if@ltj@@geometry@tate
 \@ltj@@geometry@tatefalse
 \ifluatex\else % pTeX
@@ -18,7 +19,9 @@
 
 \RequirePackage{filehook}
 
-
+\AtBeginOfPackageFile{geometry}{%
+  \ltj@@geometry@topskip@backup=\topskip
+}
 \AtEndOfPackageFile{geometry}{%
 \ifluatex
   \ifnum\ltjgetparameter{direction}=3 \@ltj@@geometry@tatetrue\fi
@@ -165,16 +168,20 @@
         \Gm@defbylen{height}{\Gm@vscale\Gm@layoutheight}%
       \fi
     \fi
+    \setlength\topskip\ltj@@geometry@topskip@backup
     \ifx\Gm@lines\@undefined\else
       \setlength\maxdepth{1\Cht}%
-      \setlength\topskip{.5\maxdepth}%
       \setbox\z@=\hbox{\tate% next \ifdim must be executed in tate dir.
         \ifdim\topskip<\ht\tstrutbox
-          \global\@tempdima\topskip 
+          \@tempdima\topskip
           \global\topskip\ht\tstrutbox
-          \Gm@warning{\noexpand\topskip was changed from \the\@tempdima\space
-            to \the\topskip}
-        \fi}
+          \PackageWarningNoLine{lltjp-geometry}%
+           {do not worry about  `\noexpand\topskip was changed ...'\MessageBreak
+              warning above}
+          \PackageWarningNoLine{lltjp-geometry}%
+            {\noexpand\topskip was changed from \the\@tempdima\space
+              to \the\topskip}
+        \fi}%
       \setlength\@tempdima{\baselineskip}%
       \multiply\@tempdima\Gm@lines
       \addtolength\@tempdima{\topskip}%

diff --git a/src/patches/lltjp-stfloats.sty b/src/patches/lltjp-stfloats.sty
index 2902ef1..e90cef4 100644 (file)
--- a/src/patches/lltjp-stfloats.sty
+++ b/src/patches/lltjp-stfloats.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-stfloats}[2014/09/08 Patch to stfloats for LuaTeX-ja]
+\ProvidesPackage{lltjp-stfloats}[2014/11/23 Patch to stfloats for LuaTeX-ja]
 
 \RequirePackage{stfloats,luatexja}
 
@@ -35,7 +35,8 @@
        \@texttop
        \dimen@ \ltjgetdp\@outputbox
        \unvbox \@outputbox
-       \ifnum\ltjgetparameter{direction}=3 \hskip\z@\else\vskip -\dimen@\fi
+       \ifnum\ltjgetparameter{direction}=3 \hskip\z@\fi %%% LuaTeX-ja
+       \vskip -\dimen@
        \@textbottom
        }%
    \fi
@@ -43,7 +44,6 @@
   }
 
 \ifx\@makecol\ltj@fn@makecol
-  \message{TRUE}
   \global\let\@makecol\fn@makecol
 \fi
 \endinput