summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-02-21 00:35:20 +0000
committerKarl Berry <karl@freefriends.org>2017-02-21 00:35:20 +0000
commit3bbc63d38cf997ca6f9ca5700f4f9f98b014e0d9 (patch)
treef97d4d0a3999b87a34cfee47958c778979bf8eaa /Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
parent6e8dfd310421201e3ac8847d1e8b8fa98e81c4d8 (diff)
luatexja (19feb17)
git-svn-id: svn://tug.org/texlive/trunk@43283 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty22
1 files changed, 20 insertions, 2 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
index a075947af0f..9c49367fede 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/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
@@ -266,10 +271,23 @@
\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
}%
\fi
\global \maxdepth \@maxdepth
}
+\let\ltj@orig@makecol=\@makecol
+
+\patchcmd\@makespecialcolbox{\@textbottom}{\ifltj@ftn@unvboxed\iffnfixbottom\else\@textbottom\fi\else\@textbottom\fi}{}{}
+
+\def\@gnewline #1{%
+ \ifvmode
+ \@nolnerr
+ \else
+ \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
+ % \null は \break の効果が行頭禁則文字で打ち消されないために必要
+ \ignorespaces
+\fi}
+
\endinput