summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/patches
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-03-29 21:46:01 +0000
committerKarl Berry <karl@freefriends.org>2018-03-29 21:46:01 +0000
commit55b3f71ee402e3787f22920118ac196189e004e5 (patch)
treeb5ee6922ba0769602659650b6e07619215dcfcb8 /Master/texmf-dist/tex/luatex/luatexja/patches
parentb8f3a39a2006c0ab12761d26a6b393fdb276ea8c (diff)
luatexja (29mar18)
git-svn-id: svn://tug.org/texlive/trunk@47178 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/patches')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty5
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty5
2 files changed, 6 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
index a269ee43c8a..a4559a67665 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
@@ -195,7 +195,9 @@
\language\l@nohyphenation
\@ifstar\@sverb\@verb}
\fi
-\gdef\@stopfield{\null\color@endgroup\egroup}
+\gdef\@stopfield{%
+ \inhibitglue\@tempskipa\lastskip\unskip
+ \hskip\@tempskipa\color@endgroup\egroup}
\pretocmd{\footnote}{\inhibitglue}{}{}
\pretocmd{\footnotemark}{\inhibitglue}{}{}
\patchcmd{\@footnotemark}{\@makefnmark}{%
@@ -324,5 +326,4 @@
\def\ltj@unhbox@curfield{\ltjfakeboxbdd\unhbox\@curfield\ltjfakeboxbdd}
%\patchcmd\@contfield{\unhbox\@curfield}{\ltj@unhbox@curfield}{}{}
\patchcmd\@addfield{\unhbox\@curfield}{\ltj@unhbox@curfield}{}{}
-\pretocmd\@stopfield{\inhibitglue}{}{}
\endinput
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty
index 94a5318f317..4cc3d0c0171 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-array}[2018/03/25 Patch to array for LuaTeX-ja]
+\ProvidesPackage{lltjp-array}[2018/03/29 Patch to array for LuaTeX-ja]
\RequirePackage{etoolbox,array,luatexja}
@@ -13,6 +13,7 @@
\ltj@sharp
}{}{}
+\@ifpackageloaded{lltjext}{}{%
%% remove extra \xkanjiskip (pLaTeX2e 2016/04/17)
\def\@tabular{%
\leavevmode \null
@@ -21,5 +22,5 @@
\@tabarray}
\def\endtabular{\endarray $\egroup\null}
\expandafter \let \csname endtabular*\endcsname = \endtabular
-
+}
\endinput