ソースコードの管理場所
Revision | 549ee2a8dbcf5ee55534b9d697fda232e9e1a81e (tree) |
---|---|
Time | 2018-09-10 06:04:46 |
Author | Hironori Kitagawa <h_kitagawa2001@yaho...> |
Commiter | Hironori Kitagawa |
lltjext.sty: sync with platex/621ee3c
@@ -3,7 +3,7 @@ | ||
3 | 3 | % |
4 | 4 | |
5 | 5 | \NeedsTeXFormat{LaTeX2e} |
6 | -\ProvidesPackage{lltjext}[2018/03/29 v1.2g-ltj-9 Macros for vertical writing] | |
6 | +\ProvidesPackage{lltjext}[2018/09/10 v1.2i-ltj-9 Macros for vertical writing] | |
7 | 7 | \RequirePackage{luatexja} |
8 | 8 | \newcount\ltj@ext@dir |
9 | 9 | {\catcode`\*=11 |
@@ -36,6 +36,7 @@ | ||
36 | 36 | {\p@array<#1>}{\p@array<#1>[c]}} |
37 | 37 | |
38 | 38 | \def\p@array<#1>[#2]#3{% |
39 | + \fork@array@option<#1>[#2]\@begin@alignbox | |
39 | 40 | \let\box@dir\relax |
40 | 41 | \if #1z\relax |
41 | 42 | \ifnum\ltj@ext@dir=3\relax |
@@ -60,19 +61,21 @@ | ||
60 | 61 | \else \let\box@dir\utod\@tempcnta=\zstrutbox% utod |
61 | 62 | \fi |
62 | 63 | \fi |
64 | + \bgroup\box@dir\adjustbaseline | |
63 | 65 | \setbox\@arstrutbox\hbox{% |
64 | 66 | \box@dir |
65 | 67 | \vrule\@height\arraystretch\ltjgetht\@tempcnta |
66 | 68 | \@depth\arraystretch\ltjgetdp\@tempcnta \@width\z@}% |
67 | - \fork@array@option<#1>[#2]% | |
68 | 69 | \@mkpream{#3}\edef\@preamble{\ialign \noexpand\@halignto |
69 | 70 | \bgroup\@arstrut \@preamble \tabskip\z@skip \cr}% |
70 | 71 | \let\@startpbox\@@startpbox \let\@endpbox\@@endpbox |
71 | 72 | \let\tabularnewline\\% |
72 | - \@begin@alignbox\bgroup\box@dir\adjustbaseline | |
73 | 73 | \let\par\@empty |
74 | - \let\@sharp##\let\protect\relax | |
75 | - \lineskip\z@skip\baselineskip\z@skip\@preamble} | |
74 | + \let\@sharp##% | |
75 | + \set@typeset@protect | |
76 | + \lineskip\z@skip\baselineskip\z@skip | |
77 | + \ifhmode \@preamerr\z@ \@@par\fi | |
78 | + \@preamble} | |
76 | 79 | \def\endarray{\crcr\egroup\egroup\@end@alignbox} |
77 | 80 | \def\endtabular{\endarray$\egroup} |
78 | 81 | \expandafter \let \csname endtabular*\endcsname = \endtabular |
@@ -217,12 +220,21 @@ | ||
217 | 220 | \@ifnextchar[{\@iilayoutcaption}{\relax}} |
218 | 221 | \def\@iilayoutcaption[#1#2]{% |
219 | 222 | \def\caption@posa{#1}\def\caption@posb{#2}} |
220 | -\def\pcaption{\refstepcounter\@captype \@dblarg{\@pcaption\@captype}} | |
223 | +\def\pcaption{% | |
224 | + \ifx\@captype\@undefined | |
225 | + \@latex@error{\noexpand\pcaption outside float}\@ehd | |
226 | + \expandafter\@gobble | |
227 | + \else | |
228 | + \refstepcounter\@captype | |
229 | + \expandafter\@firstofone | |
230 | + \fi | |
231 | + {\@dblarg{\@pcaption\@captype}}% | |
232 | +} | |
221 | 233 | \long\def\@pcaption#1[#2]#3{% |
222 | 234 | \addcontentsline{\csname ext@#1\endcsname}{#1}{% |
223 | 235 | \protect\numberline{\csname the#1\endcsname}{\ignorespaces#2}}% |
224 | 236 | \ifvoid\@floatbox |
225 | - \latex@error{Use with `\protect\layoutfloat'.}\@eha | |
237 | + \@latex@error{Use \noexpand\pcaption with `\protect\layoutfloat'}\@eha | |
226 | 238 | \fi |
227 | 239 | \make@pcaptionbox{#3}% |
228 | 240 | \@pboxswfalse |