X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fpatches%2Flltjcore.sty;h=a269ee43c8a0d90e58eb824b414bcdd700d65b15;hb=e5c4f3fcce78056289de1ddac52dd695d887046e;hp=55c1537239231bde897335157c8c83a6bf4972f6;hpb=eca447320377eb00cd1f2dc4f4abdb7d0041b8b9;p=luatex-ja%2Fluatexja.git

diff --git a/src/patches/lltjcore.sty b/src/patches/lltjcore.sty
index 55c1537..a269ee4 100644
--- a/src/patches/lltjcore.sty
+++ b/src/patches/lltjcore.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjcore}[2017/08/27 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
@@ -183,8 +183,9 @@
     \@latex@warning{Reference `#3' on page \thepage \space
               undefined}%
   \else
-    \expandafter#2#1\spacefactor\@m{}% change \null to \spacefactor\@m{}
+    \expandafter#2#1\protect\@setref@{}% change \null to \protect\@setref@{}
   \fi}
+\gdef\@setref@{\ifhmode\spacefactor\@m\fi}
 \endgroup
 \if@compatibility\else
 \def\verb{\relax\ifmmode\hbox\else\leavevmode\vadjust{}\fi
@@ -195,17 +196,12 @@
     \@ifstar\@sverb\@verb}
 \fi
 \gdef\@stopfield{\null\color@endgroup\egroup}
-\newcount\hour
-\newcount\minute
 \pretocmd{\footnote}{\inhibitglue}{}{}
 \pretocmd{\footnotemark}{\inhibitglue}{}{}
 \patchcmd{\@footnotemark}{\@makefnmark}{%
   \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
@@ -290,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
@@ -319,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}{}{}