From e5c4f3fcce78056289de1ddac52dd695d887046e Mon Sep 17 00:00:00 2001
From: Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Date: Sun, 25 Mar 2018 14:03:35 +0900
Subject: [PATCH] patches for tabular

---
 src/patches/lltjcore.sty    | 10 +++++-----
 src/patches/lltjp-array.sty | 11 ++++++++++-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/patches/lltjcore.sty b/src/patches/lltjcore.sty
index 80abe69..a269ee4 100644
--- a/src/patches/lltjcore.sty
+++ b/src/patches/lltjcore.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjcore}[2017/11/12 Patch to LaTeX2e Kernel for LuaTeX-ja]
+\ProvidesPackage{lltjcore}[2018/03/25 Patch to LaTeX2e Kernel for LuaTeX-ja]
 \RequirePackage{etoolbox}
 
 \def\cleardoublepage{\clearpage\if@twoside
@@ -202,9 +202,6 @@
   \unless\ifnum\ltjgetparameter{direction}=3 \@makefnmark%
   \else\hbox to\z@{\hskip-.25\zw\raise.9\zh\@makefnmark\hss}\fi%
 }{}{}
-\patchcmd{\@tabular}{\leavevmode}{\leavevmode\null}{}{}
-\apptocmd{\endtabular}{\null}{}{}
-\expandafter \let \csname endtabular*\endcsname = \endtabular
 \let\@parboxto\@empty
 \long\def\@iiiparbox#1#2[#3]#4#5{%
   \leavevmode
@@ -289,7 +286,7 @@
 
 
 %%%%%% tabular (platex/#43) \@tabclassz
-\def\ltj@sharp{\ltjfakeboxbdd\ignorespaces\@sharp\unskip\ltjfakeboxbdd}
+\def\ltj@sharp{\relax\pltx@next@inhibitglue\ltjfakeboxbdd\ignorespaces\@sharp\unskip\ltjfakeboxbdd}
 \def\@tabclassz{%
   \ifcase\@lastchclass
     \@acolampacol
@@ -318,6 +315,9 @@
 }{%
    \everypar\expandafter{\the\everypar\ltjfakeboxbdd}\ignorespaces\@sharp\unskip
 }{}{}
+\patchcmd{\@tabular}{\leavevmode}{\leavevmode\null}{}{}
+\apptocmd{\endtabular}{\null}{}{}
+\expandafter \let \csname endtabular*\endcsname = \endtabular
 
 %%%%%% tabbing (platex/#53)
 \patchcmd\@startline{\strut}{\strut\inhibitglue}{}{}
diff --git a/src/patches/lltjp-array.sty b/src/patches/lltjp-array.sty
index 185eab2..94a5318 100644
--- a/src/patches/lltjp-array.sty
+++ b/src/patches/lltjp-array.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-array}[2017/06/18 Patch to array for LuaTeX-ja]
+\ProvidesPackage{lltjp-array}[2018/03/25 Patch to array for LuaTeX-ja]
 
 \RequirePackage{etoolbox,array,luatexja}
 
@@ -13,4 +13,13 @@
    \ltj@sharp
 }{}{}
 
+%% remove extra \xkanjiskip (pLaTeX2e 2016/04/17)
+\def\@tabular{%
+	    \leavevmode \null
+	    \hbox \bgroup $\col@sep\tabcolsep \let\d@llarbegin\begingroup
+	                                      \let\d@llarend\endgroup
+	    \@tabarray}
+\def\endtabular{\endarray $\egroup\null}
+\expandafter \let \csname endtabular*\endcsname = \endtabular
+
 \endinput
-- 
2.11.0