diff options
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/lltjext.sty')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/lltjext.sty | 55 |
1 files changed, 34 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty b/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty index 13f2d62456e..49151f5517d 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty @@ -3,12 +3,9 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjext}[2018/03/29 v1.2g-ltj-9 Macros for vertical writing] +\ProvidesPackage{lltjext}[2018/09/22 v1.2j-ltj-9 Macros for vertical writing] \RequirePackage{luatexja} \newcount\ltj@ext@dir -{\catcode`\*=11 -\global\let\ltj@lltjext@orig@tabularS=\tabular* -}% \let\ltj@lltjext@orig@tabular=\tabular \let\ltj@lltjext@orig@array=\array @@ -19,12 +16,15 @@ \ltj@ext@dir=\ltjgetparameter{direction}\relax\X@tabarray} \def\tabular{\let\@halignto\@empty\X@tabular} \@namedef{tabular*}{\@ifnextchar<%> - {\@stabular}{\@stabular<Z>}} + {\p@stabular}{\p@stabular<Z>}} +{\catcode`\*=11 +\global\let\ltj@lltjext@orig@tabularS=\tabular* +}% \def\X@tabarray{\@ifnextchar<%> {\p@tabarray}{\p@tabarray<Z>}} \def\X@tabular{\@ifnextchar<%> {\p@tabular}{\p@tabular<Z>}} -\def\@stabular<#1>#2{% +\def\p@stabular<#1>#2{% \setlength\dimen@{#2}% \edef\@halignto{to\the\dimen@}\p@tabular<#1>} \def\p@tabular<#1>{\leavevmode \hbox \bgroup @@ -60,19 +60,22 @@ \else \let\box@dir\utod\@tempcnta=\zstrutbox% utod \fi \fi + \fork@array@option<#1>[#2]\@begin@alignbox + \bgroup\box@dir\adjustbaseline \setbox\@arstrutbox\hbox{% \box@dir \vrule\@height\arraystretch\ltjgetht\@tempcnta \@depth\arraystretch\ltjgetdp\@tempcnta \@width\z@}% - \fork@array@option<#1>[#2]% \@mkpream{#3}\edef\@preamble{\ialign \noexpand\@halignto \bgroup\@arstrut \@preamble \tabskip\z@skip \cr}% \let\@startpbox\@@startpbox \let\@endpbox\@@endpbox \let\tabularnewline\\% - \@begin@alignbox\bgroup\box@dir\adjustbaseline \let\par\@empty - \let\@sharp##\let\protect\relax - \lineskip\z@skip\baselineskip\z@skip\@preamble} + \let\@sharp##% + \set@typeset@protect + \lineskip\z@skip\baselineskip\z@skip + \ifhmode \@preamerr\z@ \@@par\fi + \@preamble} \def\endarray{\crcr\egroup\egroup\@end@alignbox} \def\endtabular{\endarray$\egroup} \expandafter \let \csname endtabular*\endcsname = \endtabular @@ -193,11 +196,11 @@ }\hrule width\floatwidth height\floatruletick depth\z@}} \def\DeclareLayoutCaption#1<#2>(#3)[#4#5]{% \expandafter - \ifx\csname #1@layoutcaption\endcsname\relax \else + \ifx\csname #1@layoutc@ption\endcsname\relax \else \@latex@info{Redeclaring capiton layout setting of '#1'}% \fi \expandafter - \gdef\csname #1@layoutcaption\endcsname{% + \gdef\csname #1@layoutc@ption\endcsname{% \if Z\caption@dir\def\caption@dir{#2}\fi \ifdim\captionwidth=\z@ \captionwidth=#3\relax\fi \if Z\caption@posa\def\caption@posa{#4}\fi @@ -217,12 +220,21 @@ \@ifnextchar[{\@iilayoutcaption}{\relax}} \def\@iilayoutcaption[#1#2]{% \def\caption@posa{#1}\def\caption@posb{#2}} -\def\pcaption{\refstepcounter\@captype \@dblarg{\@pcaption\@captype}} +\def\pcaption{% + \ifx\@captype\@undefined + \@latex@error{\noexpand\pcaption outside float}\@ehd + \expandafter\@gobble + \else + \refstepcounter\@captype + \expandafter\@firstofone + \fi + {\@dblarg{\@pcaption\@captype}}% +} \long\def\@pcaption#1[#2]#3{% \addcontentsline{\csname ext@#1\endcsname}{#1}{% \protect\numberline{\csname the#1\endcsname}{\ignorespaces#2}}% \ifvoid\@floatbox - \latex@error{Use with `\protect\layoutfloat'.}\@eha + \@latex@error{Use \noexpand\pcaption with `\protect\layoutfloat'}\@eha \fi \make@pcaptionbox{#3}% \@pboxswfalse @@ -230,22 +242,23 @@ \if l\caption@posb\box\@captionbox\kern\captionfloatsep\fi \if t\caption@posa\vtop \else\if b\caption@posa\vbox - \else\ifmmode\vcenter \else\@pboxswtrue $\vcenter \fi\fi\fi + \else\@pboxswtrue $\vcenter \fi\fi {\if u\caption@posb\box\@captionbox\kern\captionfloatsep\fi \unvbox\@floatbox \if d\caption@posb\kern\captionfloatsep\box\@captionbox\fi}% + \if@pboxsw \m@th$\fi \if r\caption@posb\kern\captionfloatsep\box\@captionbox\fi - \if@pboxsw \m@th$\fi \if r\float@pos\else\hss\fi}}% + \if r\float@pos\else\hss\fi}}% \par\vskip.25\baselineskip \box\@tempboxa} \def\make@pcaptionbox#1{% \expandafter - \ifx\csname\@captype @layoutcaption\endcsname\relax + \ifx\csname\@captype @layoutc@ption\endcsname\relax \@latex@warning{Default caption layout of `\@captype' unknown.}% \def\caption@dir{Z}\captionwidth\z@ \def\caption@posa{Z}\def\caption@posb{Z}% \else - \csname \@captype @layoutcaption\endcsname + \csname \@captype @layoutc@ption\endcsname \fi \@tempswafalse % \@tempswa: 基本組の組方向とキャプションの組方向が直交するか? @@ -652,9 +665,11 @@ \def\ltj@lltjext@patch@array{% \patchcmd{\@tabular}{\hbox\bgroup}{% - \hbox\bgroup\ltj@ext@dir=\ltjgetparameter{direction}}{\typeout{SUCC}}{} + \hbox\bgroup\ltj@ext@dir=\ltjgetparameter{direction}}{}{} \pretocmd{\array}% {\ltj@ext@dir=\ltjgetparameter{direction}\relax}{}{} + \expandafter\let\csname tabular*\endcsname=\ltj@lltjext@orig@tabularS + \patchcmd{\p@stabular}{\p@tabular}{\@tabular}{}{} \def\@startpbox##1{\bgroup \box@dir\adjustbaseline%%% これを追加 \setlength\hsize{##1}\@arrayparboxrestore @@ -710,12 +725,10 @@ } \@ifpackageloaded{array}{% - \expandafter\let\csname tabular*\endcsname=\ltj@lltjext@orig@tabularS \let\tabular=\ltj@lltjext@orig@tabular \let\array=\ltj@lltjext@orig@array \ltj@lltjext@patch@array }{% - \let\ltj@lltjext@orig@tabularS\relax \let\ltj@lltjext@orig@tabular\relax \let\ltj@lltjext@orig@array\relax \RequirePackage{filehook,etoolbox} |