%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjext}[2015/09/18 v1.2-ltj-4 Macros for vertical writing]
+\ProvidesPackage{lltjext}[2018/03/29 v1.2g-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
%%% array and tabular
\def\array{\let\@acol\@arrayacol \let\@classz\@arrayclassz
\let\@classiv\@arrayclassiv
- \let\\\@arraycr\let\@halignto\@empty\X@tabarray}
+ \let\\\@arraycr\let\@halignto\@empty
+ \ltj@ext@dir=\ltjgetparameter{direction}\relax\X@tabarray}
\def\tabular{\let\@halignto\@empty\X@tabular}
\@namedef{tabular*}{\@ifnextchar<%>
{\@stabular}{\@stabular<Z>}}
{\p@tabarray}{\p@tabarray<Z>}}
\def\X@tabular{\@ifnextchar<%>
{\p@tabular}{\p@tabular<Z>}}
-\def\@stabular<#1>#2{\def\@halignto{to#2}\p@tabular<#1>}
+\def\@stabular<#1>#2{%
+ \setlength\dimen@{#2}%
+ \edef\@halignto{to\the\dimen@}\p@tabular<#1>}
\def\p@tabular<#1>{\leavevmode \hbox \bgroup
- \count@=\ltjgetparameter{direction}$\let\@acol\@tabacol
+ \ltj@ext@dir=\ltjgetparameter{direction}
+ $\let\@acol\@tabacol
\let\@classz\@tabclassz
\let\@classiv\@tabclassiv \let\\\@tabularcr\p@tabarray<#1>}
\def\p@tabarray<#1>{\m@th\@ifnextchar[%]
\def\p@array<#1>[#2]#3{%
\let\box@dir\relax
\if #1z\relax
- \ifnum\ltjgetparameter{direction}=3\relax
+ \ifnum\ltj@ext@dir=3\relax
\let\box@dir\utod\@tempcnta=\zstrutbox
\fi
\else
\if #1y\relax
- \let\box@dir\yoko\@tempcnta=\strutbox
+ \let\box@dir\yoko\@tempcnta=\ystrutbox
\else\if #1t\relax
\let\box@dir\tate\@tempcnta=\tstrutbox
\else\if #1d\relax
\fi\fi\fi\fi
\fi
\ifx\box@dir\relax
- \ifcase\count@
+ \ifcase\ltj@ext@dir
\or \let\box@dir\dtou\@tempcnta=\dstrutbox% dtou
\or\or\let\box@dir\tate\@tempcnta=\tstrutbox% tate
- \or \let\box@dir\yoko\@tempcnta=\strutbox% yoko
+ \or \let\box@dir\yoko\@tempcnta=\ystrutbox% yoko
\else \let\box@dir\utod\@tempcnta=\zstrutbox% utod
\fi
\fi
\fork@array@option<#1>[#2]%
\@mkpream{#3}\edef\@preamble{\ialign \noexpand\@halignto
\bgroup\@arstrut \@preamble \tabskip\z@skip \cr}%
- \let\tabularnewline\\%
+ \let\@startpbox\@@startpbox \let\@endpbox\@@endpbox
+ \let\tabularnewline\\%
\@begin@alignbox\bgroup\box@dir\adjustbaseline
\let\par\@empty
\let\@sharp##\let\protect\relax
\def\endarray{\crcr\egroup\egroup\@end@alignbox}
\def\endtabular{\endarray$\egroup}
\expandafter \let \csname endtabular*\endcsname = \endtabular
-\def\fork@array@option<#1>[#2]{%
-\ifnum\ltjgetparameter{direction}=4 % yoko
- \ifx\box@dir\yoko
- \if #2t\relax
- \let\@begin@alignbox\vtop
- \let\@end@alignbox\relax
- \else\if #2b\relax
- \let\@begin@alignbox\vbox
- \let\@end@alignbox\relax
- \else
- \let\@begin@alignbox\vcenter
- \let\@end@alignbox\relax
- \fi\fi
+% ↓中身\周囲→ yoko tate utod dtou
+% yoko A* B* B B
+% tate B* A* D C
+% utod B D* A C
+% dtou B C C A
+% A: 周囲と中身の組方向が一致.そのまま \vtop/\vcenter/\vbox
+% B: 周囲と中身が90度ずれ.上端/下端がベースラインに揃うように
+% C: 周囲と中身が180度ずれ.\vtop, \vbox 入れ替え
+% D: 欧文ベースライン同士を揃えるようにする
+
+\def\fork@array@option@@A#1{%
+ \let\@end@alignbox\relax
+ \if #1t\relax \let\@begin@alignbox\vtop
+ \else\if #1b\relax\let\@begin@alignbox\vbox
+ \else \let\@begin@alignbox\vcenter
+ \fi\fi}
+\def\fork@array@option@@B#1{%
+ \if #1t\relax
+ \def\@begin@alignbox{\vtop\bgroup\kern\z@\vbox}%
+ \let\@end@alignbox\egroup
+ \else\if #1b\relax
+ \def\@begin@alignbox{\vbox\bgroup\vbox}%
+ \def\@end@alignbox{\kern\z@\egroup}%
\else
- \if #2t\relax
- \def\@begin@alignbox{\vtop\bgroup\kern\z@\vbox}%
- \def\@end@alignbox{\egroup}%
- \else\if #2b\relax
- \let\@begin@alignbox\vbox
- \let\@end@alignbox\relax
- \else
- \let\@begin@alignbox\vcenter
- \let\@end@alignbox\relax
- \fi\fi
+ \let\@begin@alignbox\vcenter
+ \let\@end@alignbox\relax
+ \fi\fi}
+\def\fork@array@option@@C#1{%
+ \let\@end@alignbox\relax
+ \if #1t\relax \let\@begin@alignbox\vbox
+ \else\if #1b\relax\let\@begin@alignbox\vtop
+ \else \let\@begin@alignbox\vcenter
+ \fi\fi}
+\def\fork@array@option<#1>[#2]{%
+\ifnum\ltj@ext@dir=4 % yoko
+ \ifx\box@dir\yoko \fork@array@option@@A{#2}%
+ \else \fork@array@option@@B{#2}%
\fi
-\else\ifnum\ltjgetparameter{direction}=1 % dtou
- \ifx\box@dir\yoko
- \if #2t\relax
- \def\@begin@alignbox{\vtop\bgroup\kern\z@\vbox}%
- \def\@end@alignbox{\egroup}%
- \else\if #2b\relax
- \let\@begin@alignbox\vbox
- \let\@end@alignbox\relax
- \else
- \let\@begin@alignbox\vcenter
- \let\@end@alignbox\relax
- \fi\fi
- \else\ifx\box@dir\dtou
- \if #2t\relax
- \let\@begin@alignbox\vtop
- \let\@end@alignbox\relax
- \else\if #2b\relax
- \let\@begin@alignbox\vbox
- \let\@end@alignbox\relax
- \else
- \let\@begin@alignbox\vcenter
- \let\@end@alignbox\relax
- \fi\fi
- \else % 180 度回転→vtop, vbox を入れ替える
- \if #2t\relax
- \let\@begin@alignbox\vbox %%% !!!
- \let\@end@alignbox\relax
- \else\if #2b\relax
- \let\@begin@alignbox\vtop %%% !!!
- \let\@end@alignbox\relax
- \else
- \let\@begin@alignbox\vcenter
- \let\@end@alignbox\relax
- \fi\fi
+\else\ifnum\ltj@ext@dir=1 % dtou
+ \ifx\box@dir\yoko \fork@array@option@@B{#2}%
+ \else\ifx\box@dir\dtou \fork@array@option@@A{#2}%
+ \else \fork@array@option@@C{#2}%
\fi\fi
-\else % tate, utod
- \ifx\box@dir\yoko
+\else\ifnum\ltj@ext@dir=3 % tate
+ \ifx\box@dir\yoko \fork@array@option@@B{#2}%
+ \else\ifx\box@dir\tate \fork@array@option@@A{#2}%
+ \else\ifx\box@dir\dtou \fork@array@option@@C{#2}%
+ \else
\if #2t\relax
- \def\@begin@alignbox{\vtop\bgroup\kern\z@\vbox}%
- \def\@end@alignbox{\egroup}%
+ \def\@begin@alignbox{\lower\dimexpr
+ \ltjgetparameter{talbaselineshift}-\ltjgetparameter{yalbaselineshift}\vtop}
+ \let\@end@alignbox\relax
\else\if #2b\relax
- \def\@begin@alignbox{\vbox\bgroup\vbox}%
- \def\@end@alignbox{\kern\z@\egroup}%
+ \def\@begin@alignbox{\lower\dimexpr
+ \ltjgetparameter{talbaselineshift}-\ltjgetparameter{yalbaselineshift}\vbox}
+ \let\@end@alignbox\relax
\else
\let\@begin@alignbox\vcenter
\let\@end@alignbox\relax
\fi\fi
- \else\ifx\box@dir\dtou % 180 度回転→vtop, vbox を入れ替える
+ \fi\fi\fi
+\else % utod
+ \ifx\box@dir\yoko \fork@array@option@@B{#2}%
+ \else\ifx\box@dir\utod \fork@array@option@@A{#2}%
+ \else\ifx\box@dir\dtou \fork@array@option@@C{#2}%
+ \else
\if #2t\relax
- \let\@begin@alignbox\vbox %%% !!!
+ \def\@begin@alignbox{\lower\dimexpr
+ \ltjgetparameter{yalbaselineshift}-\ltjgetparameter{talbaselineshift}\vtop}
\let\@end@alignbox\relax
\else\if #2b\relax
- \let\@begin@alignbox\vtop %%% !!!
+ \def\@begin@alignbox{\lower\dimexpr
+ \ltjgetparameter{yalbaselineshift}-\ltjgetparameter{talbaselineshift}\vbox}
\let\@end@alignbox\relax
\else
\let\@begin@alignbox\vcenter
\let\@end@alignbox\relax
\fi\fi
- \else
- \if #2t\relax
- \let\@begin@alignbox\vtop
- \let\@end@alignbox\relax
- \else\if #2b\relax
- \let\@begin@alignbox\vbox
- \let\@end@alignbox\relax
- \else
- \let\@begin@alignbox\vcenter
- \let\@end@alignbox\relax
- \fi\fi
- \fi\fi
-\fi\fi%
-}
+ \fi\fi\fi
+\fi\fi\fi}
%%% caption
\newbox\@floatbox
\csname \@captype @layoutcaption\endcsname
\fi
\@tempswafalse
- % tempswa\hline 基本組の組方向とキャプションの組方向が直交するか?
+ % \@tempswa: 基本組の組方向とキャプションの組方向が直交するか?
\if y\caption@dir \let\captiondir\yoko
\ifodd\ltjgetparameter{direction}\relax\@tempswatrue\fi
\else\if z\caption@dir \let\captiondir\relax
\def\minipage{\@ifnextchar<%>
{\X@minipage}{\X@minipage<Z>}}
\def\X@minipage<#1>{\@ifnextchar[%]
- {\@iminipage<#1>}{\@iiiminipage<#1>{c}\@empty[s]}}
+ {\@iminipage<#1>}{\@iiiminipage<#1>{c}\relax[s]}}
\def\@iminipage<#1>[#2]{\@ifnextchar[%]
- {\@iiminipage<#1>{#2}}{\@iiiminipage<#1>{#2}\@empty[s]}}
+ {\@iiminipage<#1>{#2}}{\@iiiminipage<#1>{#2}\relax[s]}}
\def\@iiminipage<#1>#2[#3]{\@ifnextchar[%]
{\@iiiminipage<#1>{#2}{#3}}{\@iiiminipage<#1>{#2}{#3}[#2]}}
\def\@iiiminipage<#1>#2#3[#4]#5{%
\let\@footnotetext\@mpfootnotetext
\let\@listdepth\@mplistdepth \@mplistdepth\z@
\@minipagerestore
- \global\@minipagetrue %% \global added 24 May 89
- \everypar{\global\@minipagefalse\everypar{}}}
+ \@setminipage}
\def\endminipage{%
\par
\unskip
\footnoterule
\unvbox\@mpfootins
\fi
- \global\@minipagefalse %% added 24 May 89
+ \@minipagefalse %% added 24 May 89
\color@endgroup
\egroup
\expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa}\egroup}
-\def\parbox{\@ifnextchar<%>
+\DeclareRobustCommand\parbox{\@ifnextchar<%>
{\X@parbox}{\X@parbox<Z>}}
\def\X@parbox<#1>{\@ifnextchar[%]
- {\@iparbox<#1>}{\@iiiparbox<#1>{c}\@empty[s]}}
+ {\@iparbox<#1>}{\@iiiparbox<#1>{c}\relax[s]}}
\def\@iparbox<#1>[#2]{\@ifnextchar[%]
- {\@iiparbox<#1>{#2}}{\@iiiparbox<#1>{#2}\@empty[s]}}
+ {\@iiparbox<#1>{#2}}{\@iiiparbox<#1>{#2}\relax[s]}}
\def\@iiparbox<#1>#2[#3]{\@ifnextchar[%]%
{\@iiiparbox<#1>{#2}{#3}}{\@iiiparbox<#1>{#2}{#3}[#2]}}
\long\def\@iiiparbox<#1>#2#3[#4]#5#6{%
- \leavevmode\bgroup
+ \leavevmode
\setlength\@tempdima{#5}%
\fork@parbox@option<#1>[#2]%
\@begin@tempboxa\vbox{\box@dir
- \hsize\@tempdima\@parboxrestore\adjustbaseline#6\endgraf}%
- \ifx\@empty#3\relax\else
+ \hsize\@tempdima\@parboxrestore\adjustbaseline#6\@@par}%
+ \ifx\relax#3\else
\setlength\@tempdimb{#3}%
- \def\@parboxto{to\@tempdimb}%
+ \edef\@parboxto{to\the\@tempdimb}%
\fi
\@begin@parbox\@parboxto{\box@dir\adjustbaseline
\let\hss\vss\let\unhbox\unvbox
\csname bm@#4\endcsname}\@end@parbox
- \@end@tempboxa\egroup}
+ \@end@tempboxa}
+
+
+% ↓中身\周囲→ yoko tate utod dtou
+% yoko A* B* B B
+% tate B* A* D C
+% utod B D* A C
+% dtou B C C A
+% A: 周囲と中身の組方向が一致.そのまま \vtop/\vcenter/\vbox
+% B: 周囲と中身が90度ずれ.上端が和文の高さ or 下端が和文の深さに揃うように
+% C: 周囲と中身が180度ずれ.(コードは B のものを流用)
+% D: 上端が和文の高さ or 下端が和文の深さに揃うように(コードは B のものを流用)
+
+\def\fork@parbox@option@@A#1{%
+ \let\@end@parbox\relax
+ \if #1t\relax \let\@begin@parbox\vtop
+ \else\if #1b\relax\let\@begin@parbox\vbox
+ \else
+ \ifmmode
+ \let\@begin@parbox\vcenter\let\@end@parbox\relax
+ \else
+ \def\@begin@parbox{\null$\vcenter}%
+ \def\@end@parbox{\m@th$\null}%
+ \fi
+ \fi\fi}
+\def\lltjext@getjablshift{%
+ \ifnum\ltj@ext@dir=3 \ltjgetparameter{tjabaselineshift}\else
+ \ltjgetparameter{yjabaselineshift}\fi}
+\def\fork@parbox@option@@B#1{%
+ \if #1t\relax
+ \def\@begin@parbox{\raise\dimexpr\cht-\lltjext@getjablshift\vtop\bgroup\kern\z@\vbox}%
+ \let\@end@parbox\egroup
+ \else\if #1b\relax
+ \def\@begin@parbox{\lower\dimexpr\cdp+\lltjext@getjablshift\vbox\bgroup\vbox}%
+ \def\@end@parbox{\kern\z@\egroup}%
+ \else
+ \ifmmode
+ \let\@begin@parbox\vcenter\let\@end@parbox\relax
+ \else
+ \def\@begin@parbox{\null$\vcenter}%
+ \def\@end@parbox{\m@th$\null}%
+ \fi
+ \fi\fi}
+\let\fork@parbox@option@@C=\fork@parbox@option@@B
\def\fork@parbox@option<#1>[#2]{%
- \let\box@dir\relax
+ \let\box@dir\relax \ltj@ext@dir=\ltjgetparameter{direction}\relax
\if #1z\relax
- \ifnum\ltjgetparameter{direction}=3\relax
+ \ifnum\ltj@ext@dir=3\relax
\let\box@dir\utod
\fi
\else
\fi\fi\fi\fi
\fi
\ifx\box@dir\relax
- \ifcase\ltjgetparameter{direction}\relax
+ \ifcase\ltj@ext@dir
\or \let\box@dir\dtou
\or\or\let\box@dir\tate
\or \let\box@dir\yoko
\else \let\box@dir\utod
\fi
\fi
-%%% now almost same as \fork@array@option
-\ifnum\ltjgetparameter{direction}=4 % yoko
- \ifx\box@dir\yoko
- \if #2t\relax
- \let\@begin@parbox\vtop
- \let\@end@parbox\relax
- \else\if #2b\relax
- \let\@begin@parbox\vbox
- \let\@end@parbox\relax
- \else
- \def\@begin@parbox{$\vcenter}%
- \def\@end@parbox{\m@th$}%
- \fi\fi
- \else
- \if #2t\relax
- \def\@begin@parbox{\vtop\bgroup\kern\z@\vbox}%
- \def\@end@parbox{\egroup}%
- \else\if #2b\relax
- \let\@begin@parbox\vbox
- \let\@end@parbox\relax
- \else
- \def\@begin@parbox{$\vcenter}%
- \def\@end@parbox{\m@th$}%
- \fi\fi
+\ifnum\ltj@ext@dir=4 % yoko
+ \ifx\box@dir\yoko \fork@parbox@option@@A{#2}%
+ \else \fork@parbox@option@@B{#2}%
\fi
-\else\ifnum\ltjgetparameter{direction}=1 % dtou
- \ifx\box@dir\yoko
- \if #2t\relax
- \def\@begin@parbox{\vtop\bgroup\kern\z@\vbox}
- \def\@end@parbox{\egroup}
- \else\if #2b\relax
- \let\@begin@parbox\vbox
- \let\@end@parbox\relax
- \else
- \def\@begin@parbox{$\vcenter}%
- \def\@end@parbox{\m@th$}%
- \fi\fi
- \else\ifx\box@dir\dtou
- \if #2t\relax
- \let\@begin@parbox\vtop
- \let\@end@parbox\relax
- \else\if #2b\relax
- \let\@begin@parbox\vbox
- \let\@end@parbox\relax
- \else
- \def\@begin@parbox{$\vcenter}%
- \def\@end@parbox{\m@th$}%
- \fi\fi
- \else % 180 度回転→vtop, vbox を入れ替える
- \if #2t\relax
- \let\@begin@parbox\vbox %%% !!!
- \let\@end@parbox\relax
- \else\if #2b\relax
- \let\@begin@parbox\vtop %%% !!!
- \let\@end@parbox\relax
- \else
- \def\@begin@parbox{$\vcenter}%
- \def\@end@parbox{\m@th$}%
- \fi\fi
- \fi\fi
-\else % tate, utod
- \ifx\box@dir\yoko
- \if #2t\relax
- \def\@begin@parbox{\vtop\bgroup\kern\z@\vbox}%
- \def\@end@parbox{\egroup}%
- \else\if #2b\relax
- \def\@begin@parbox{\vbox\bgroup\vbox}%
- \def\@end@parbox{\kern\z@\egroup}%
- \else
- \def\@begin@parbox{$\vcenter}%
- \def\@end@parbox{\m@th$}%
- \fi\fi
- \else\ifx\box@dir\dtou % 180 度回転→vtop, vbox を入れ替える
- \if #2t\relax
- \let\@begin@parbox\vbox %%% !!!
- \let\@end@parbox\relax
- \else\if #2b\relax
- \let\@begin@parbox\vtop %%% !!!
- \let\@end@parbox\relax
- \else
- \def\@begin@parbox{$\vcenter}%
- \def\@end@parbox{\m@th$}%
- \fi\fi
- \else
- \if #2t\relax
- \let\@begin@parbox\vtop
- \let\@end@parbox\relax
- \else\if #2b\relax
- \let\@begin@parbox\vbox
- \let\@end@parbox\relax
- \else
- \def\@begin@parbox{$\vcenter}%
- \def\@end@parbox{\m@th$}%
- \fi\fi
+\else\ifnum\ltj@ext@dir=1 % dtou
+ \ifx\box@dir\yoko \fork@parbox@option@@B{#2}%
+ \else\ifx\box@dir\dtou \fork@parbox@option@@A{#2}%
+ \else \fork@parbox@option@@C{#2}%
\fi\fi
-\fi\fi%
-}
+\else\ifnum\ltj@ext@dir=3 % tate
+ \ifx\box@dir\yoko \fork@parbox@option@@B{#2}%
+ \else\ifx\box@dir\tate \fork@parbox@option@@A{#2}%
+ \else\ifx\box@dir\dtou \fork@parbox@option@@C{#2}%
+ \else \fork@parbox@option@@B{#2}% D
+ \fi\fi\fi
+\else % utod
+ \ifx\box@dir\yoko \fork@parbox@option@@B{#2}%
+ \else\ifx\box@dir\utod \fork@parbox@option@@A{#2}%
+ \else\ifx\box@dir\dtou \fork@parbox@option@@C{#2}%
+ \else \fork@parbox@option@@B{#2}% D
+ \fi\fi\fi
+\fi\fi\fi}
%%% pbox
-\def\pbox{\leavevmode\@ifnextchar<{\X@makePbox}{\X@makePbox<Z>}}
+\DeclareRobustCommand\pbox{\leavevmode\@ifnextchar<{\X@makePbox}{\X@makePbox<Z>}}
\def\X@makePbox<#1>{%
\@ifnextchar[{\@imakePbox<#1>}{\@imakePbox<#1>[-5\p@]}}
\def\@imakePbox<#1>[#2]{\@ifnextchar[%]
\else \let\box@dir\utod
\fi
\fi
- \ifdim #2 <\z@ \hbox{\box@dir#4}\else
- \hbox to#2{\box@dir
+ \setlength{\@tempdima}{#2}%
+ \ifdim\@tempdima<\z@ \hbox{\box@dir#4}\else
+ \hb@xt@\@tempdima{\box@dir
\if #3l\relax\else\hss\fi
#4\relax
\if #3r\relax\else\hss\fi}\fi\egroup}
\DeclareRobustCommand\rensuji{%
\@ifstar{\not@advancelinetrue\@rensuji}{\@rensuji}}
\def\@rensuji{\@ifnextchar[{\@@rensuji}{\@@rensuji[c]}}
-\def\@@rensuji[#1]#2{\ifnum\ltjgetparameter{direction}=4\relax%
- \hbox{#2}\else
- \hskip\rensujiskip
+\def\@@rensuji[#1]#2{%
\ifvmode\leavevmode\fi
+ \ifnum\ltjgetparameter{direction}=4\relax\hbox{#2}\else
+ \hskip\rensujiskip
\setbox\tw@\hbox{漢}% 「あ」では仮名書体使用時がまずそう
\@tempdimb\ltjgetht\tw@ \advance\@tempdimb\ltjgetdp\tw@
\ifnot@advanceline\not@advancelinefalse\else
%%% kanji
\def\Kanji#1{\expandafter\@Kanji\csname c@#1\endcsname}
-\def\@Kanji#1{\expandafter\kansuji\number #1}
+\def\@Kanji#1{\kansuji #1}
\def\kanji{\ifnum\ltjgetparameter{direction}=3 \expandafter\kansuji\fi}
%%% bou
\def\boutenchar{\char\euc"A1A2}%"
\def\bou#1{\ifvmode\leavevmode\fi\@bou#1\end}
\def\@bou#1{%
- \ifx#1\end \let\next=\relax
+ \ifx#1\end \let\ltj@@next=\relax
\else
\ifnum\ltjgetparameter{direction}=3\relax
\hbox to\z@{\vbox to\z@{\boxmaxdepth\maxdimen
\vss\moveleft-0.2\zw\hbox{\boutenchar}\nointerlineskip
\hbox{\char\euc"A1A1}}\hss}\nobreak#1\relax
\fi
- \let\next=\@bou
- \fi\next}
+ \let\ltj@@next=\@bou
+ \fi\ltj@@next}
%%% kasen
\def\kasen#1{%
%%% references
\def\@eqnnum{{\reset@font\rmfamily \normalcolor
- \ifnum\ltjgetparameter{direction}=3 \raise.25\zh\hbox{\yoko(\theequation)}%
+ \ifnum\ltjgetparameter{direction}=11\raise.25\zh\hbox{\yoko(\theequation)}%
\else (\theequation)\fi}}
\def\@thecounter#1{\noexpand\rensuji{\noexpand\arabic{#1}}}
\def\@thmcounter#1{\noexpand\rensuji{\noexpand\arabic{#1}}}
%% Compatibility with array package
\def\ltj@lltjext@patch@array{%
+ \patchcmd{\@tabular}{\hbox\bgroup}{%
+ \hbox\bgroup\ltj@ext@dir=\ltjgetparameter{direction}}{\typeout{SUCC}}{}
+ \pretocmd{\array}%
+ {\ltj@ext@dir=\ltjgetparameter{direction}\relax}{}{}
\def\@startpbox##1{\bgroup
\box@dir\adjustbaseline%%% これを追加
- \hsize=##1\@arrayparboxrestore
+ \setlength\hsize{##1}\@arrayparboxrestore
\everypar{%
\vrule \@height \ltjgetht\@arstrutbox \@width \z@
\everypar{}}%
}
- \def\@tabarray{\@ifnextchar<\p@tabarray{\p@tabarray<Z>}}
+ \def\@tabarray{\@ifnextchar<\p@tabarray{\p@tabarray<z>}}
\def\p@array<##1>[##2]##3{%
\let\box@dir\relax
\if ##1z\relax
- \ifnum\ltjgetparameter{direction}=3\relax
+ \ifnum\ltj@ext@dir=3\relax
\let\box@dir\utod\@tempcnta=\zstrutbox
\fi
\else
\if ##1y\relax
- \let\box@dir\yoko\@tempcnta=\strutbox
+ \let\box@dir\yoko\@tempcnta=\ystrutbox
\else\if ##1t\relax
\let\box@dir\tate\@tempcnta=\tstrutbox
\else\if ##1d\relax
\fi\fi\fi\fi
\fi
\ifx\box@dir\relax
- \ifcase\ltjgetparameter{direction}
- \or \let\box@dir\dtou\@tempcnta=\tabskip \z@\tabskip \z@\dstrutbox% dtou
+ \ifcase\ltj@ext@dir
+ \or \let\box@dir\dtou\@tempcnta=\dstrutbox% dtou
\or\or\let\box@dir\tate\@tempcnta=\tstrutbox% tate
- \or \let\box@dir\yoko\@tempcnta=\strutbox% yoko
+ \or \let\box@dir\yoko\@tempcnta=\ystrutbox% yoko
\else \let\box@dir\utod\@tempcnta=\zstrutbox% utod
\fi
\fi
}
\@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}
+ \RequirePackage{filehook,etoolbox}
\AtEndOfPackageFile{array}{\ltj@lltjext@patch@array}
}
+%%%%%%%%%%%%%%%% LuaTeX-ja original
+
+%%\define@key[ltj]{japaram}{autouprightnum}{% %COUNT
+%% \ltj@@set@stack{AURN}{0}{10000}\z@#1 }
\endinput