%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjext}[2017/07/17 v1.2g-ltj-6 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
\ltj@ext@dir=\ltjgetparameter{direction}\relax\X@tabarray}
\def\tabular{\let\@halignto\@empty\X@tabular}
\@namedef{tabular*}{\@ifnextchar<%>
- {\@stabular}{\@stabular<z>}}
+ {\@stabular}{\@stabular<Z>}}
\def\X@tabarray{\@ifnextchar<%>
- {\p@tabarray}{\p@tabarray<z>}}
+ {\p@tabarray}{\p@tabarray<Z>}}
\def\X@tabular{\@ifnextchar<%>
- {\p@tabular}{\p@tabular<z>}}
+ {\p@tabular}{\p@tabular<Z>}}
\def\@stabular<#1>#2{%
\setlength\dimen@{#2}%
\edef\@halignto{to\the\dimen@}\p@tabular<#1>}
\def\p@tabular<#1>{\leavevmode \hbox \bgroup
- \ltj@ext@dir=\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\@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\cht\vtop\bgroup\kern\z@\vbox}%
+ \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\cdp\vbox\bgroup\vbox}%
+ \def\@begin@parbox{\lower\dimexpr\cdp+\lltjext@getjablshift\vbox\bgroup\vbox}%
\def\@end@parbox{\kern\z@\egroup}%
\else
\ifmmode
\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{%
\def\ltj@lltjext@patch@array{%
\patchcmd{\@tabular}{\hbox\bgroup}{%
- \hbox\bgroup\ltj@ext@dir=\ltjgetparameter{direction}}{}{}
+ \hbox\bgroup\ltj@ext@dir=\ltjgetparameter{direction}}{\typeout{SUCC}}{}
\pretocmd{\array}%
{\ltj@ext@dir=\ltjgetparameter{direction}\relax}{}{}
\def\@startpbox##1{\bgroup
%%%%%%%%%%%%%%%% LuaTeX-ja original
-\define@key[ltj]{japaram}{autouprightnum}{% %COUNT
- \ltj@@set@stack{AURN}{0}{10000}\z@#1 }
+%%\define@key[ltj]{japaram}{autouprightnum}{% %COUNT
+%% \ltj@@set@stack{AURN}{0}{10000}\z@#1 }
\endinput