From ab63f41137a210173bf797f28970ca2591a6cf15 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 4 Sep 2017 21:45:53 +0000 Subject: luatexja (4sep17) git-svn-id: svn://tug.org/texlive/trunk@45216 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/luatex/luatexja/patches/lltjcore.sty | 50 +++++++++------------- 1 file changed, 20 insertions(+), 30 deletions(-) (limited to 'Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty') diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty index 86bb36babee..55c15372392 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty @@ -3,7 +3,8 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjcore}[2017/06/18 Patch to LaTeX2e Kernel for LuaTeX-ja] +\ProvidesPackage{lltjcore}[2017/08/27 Patch to LaTeX2e Kernel for LuaTeX-ja] +\RequirePackage{etoolbox} \def\cleardoublepage{\clearpage\if@twoside \ifodd\c@page @@ -182,11 +183,11 @@ \@latex@warning{Reference `#3' on page \thepage \space undefined}% \else - \expandafter#2#1\relax{}% change \null to \relax + \expandafter#2#1\spacefactor\@m{}% change \null to \spacefactor\@m{} \fi} \endgroup \if@compatibility\else -\def\verb{\relax\ifmmode\hbox\else\leavevmode\fi +\def\verb{\relax\ifmmode\hbox\else\leavevmode\vadjust{}\fi \bgroup \verb@eol@error \let\do\@makeother \dospecials \verbatim@font\@noligs @@ -196,18 +197,15 @@ \gdef\@stopfield{\null\color@endgroup\egroup} \newcount\hour \newcount\minute -\RequirePackage{etoolbox} -\ifltj@everyhook@avail - \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 -\fi +\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,21 +288,8 @@ \ignorespaces \fi} -\def\@no@lnbk #1[#2]{% - \ifvmode - \@nolnerr - \else - \@tempskipa\lastskip - \unskip - \penalty #1\@getpen{#2}% - \hskip\z@\relax %% added (2017/05/03) - \ifdim\@tempskipa>\z@ - \hskip\@tempskipa - \ignorespaces - \fi - \fi} -%%%%%% \@tabclassz +%%%%%% tabular (platex/#43) \@tabclassz \def\ltj@sharp{\ltjfakeboxbdd\ignorespaces\@sharp\unskip\ltjfakeboxbdd} \def\@tabclassz{% \ifcase\@lastchclass @@ -335,5 +320,10 @@ \everypar\expandafter{\the\everypar\ltjfakeboxbdd}\ignorespaces\@sharp\unskip }{}{} - +%%%%%% tabbing (platex/#53) +\patchcmd\@startline{\strut}{\strut\inhibitglue}{}{} +\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 -- cgit v1.2.3