%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjext}
- [2014/09/06 v1.2-ltj-3 Macros for vertical writing]
+\ProvidesPackage{lltjext}[2016/12/16 v1.2c-ltj-5 Macros for vertical writing]
\RequirePackage{luatexja}
+{\catcode`\*=11
+\global\let\ltj@lltjext@orig@tabularS=\tabular*
+}%
\let\ltj@lltjext@orig@tabular=\tabular
\let\ltj@lltjext@orig@array=\array
{\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\p@tabular<#1>{\leavevmode \hbox \bgroup $\let\@acol\@tabacol
+\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
\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\count@=3\relax
\let\box@dir\utod\@tempcnta=\zstrutbox
\fi
\else
\fi\fi\fi\fi
\fi
\ifx\box@dir\relax
- \ifcase\ltjgetparameter{direction}
+ \ifcase\count@
\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
\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}
\def\fork@parbox@option<#1>[#2]{%
\let\box@dir\relax
\if #1z\relax
\let\@begin@parbox\vbox
\let\@end@parbox\relax
\else
- \def\@begin@parbox{$\vcenter}%
- \def\@end@parbox{\m@th$}%
+ \ifmmode
+ \let\@begin@parbox\vcenter\let\@end@parbox\relax
+ \else
+ \def\@begin@parbox{\null$\vcenter}%
+ \def\@end@parbox{\m@th$\null}%
+ \fi
\fi\fi
\else
\if #2t\relax
\let\@begin@parbox\vbox
\let\@end@parbox\relax
\else
- \def\@begin@parbox{$\vcenter}%
- \def\@end@parbox{\m@th$}%
+ \ifmmode
+ \let\@begin@parbox\vcenter\let\@end@parbox\relax
+ \else
+ \def\@begin@parbox{\null$\vcenter}%
+ \def\@end@parbox{\m@th$\null}%
+ \fi
\fi\fi
\fi
\else\ifnum\ltjgetparameter{direction}=1 % dtou
\let\@begin@parbox\vbox
\let\@end@parbox\relax
\else
- \def\@begin@parbox{$\vcenter}%
- \def\@end@parbox{\m@th$}%
+ \ifmmode
+ \let\@begin@parbox\vcenter\let\@end@parbox\relax
+ \else
+ \def\@begin@parbox{\null$\vcenter}%
+ \def\@end@parbox{\m@th$\null}%
+ \fi
\fi\fi
\else\ifx\box@dir\dtou
\if #2t\relax
\let\@begin@parbox\vbox
\let\@end@parbox\relax
\else
- \def\@begin@parbox{$\vcenter}%
- \def\@end@parbox{\m@th$}%
+ \ifmmode
+ \let\@begin@parbox\vcenter\let\@end@parbox\relax
+ \else
+ \def\@begin@parbox{\null$\vcenter}%
+ \def\@end@parbox{\m@th$\null}%
+ \fi
\fi\fi
\else % 180 度回転→vtop, vbox を入れ替える
\if #2t\relax
\let\@begin@parbox\vtop %%% !!!
\let\@end@parbox\relax
\else
- \def\@begin@parbox{$\vcenter}%
- \def\@end@parbox{\m@th$}%
+ \ifmmode
+ \let\@begin@parbox\vcenter\let\@end@parbox\relax
+ \else
+ \def\@begin@parbox{\null$\vcenter}%
+ \def\@end@parbox{\m@th$\null}%
+ \fi
\fi\fi
\fi\fi
\else % tate, utod
\def\@begin@parbox{\vbox\bgroup\vbox}%
\def\@end@parbox{\kern\z@\egroup}%
\else
- \def\@begin@parbox{$\vcenter}%
- \def\@end@parbox{\m@th$}%
+ \ifmmode
+ \let\@begin@parbox\vcenter\let\@end@parbox\relax
+ \else
+ \def\@begin@parbox{\null$\vcenter}%
+ \def\@end@parbox{\m@th$\null}%
+ \fi
\fi\fi
\else\ifx\box@dir\dtou % 180 度回転→vtop, vbox を入れ替える
\if #2t\relax
\let\@begin@parbox\vtop %%% !!!
\let\@end@parbox\relax
\else
- \def\@begin@parbox{$\vcenter}%
- \def\@end@parbox{\m@th$}%
+ \ifmmode
+ \let\@begin@parbox\vcenter\let\@end@parbox\relax
+ \else
+ \def\@begin@parbox{\null$\vcenter}%
+ \def\@end@parbox{\m@th$\null}%
+ \fi
\fi\fi
\else
\if #2t\relax
\let\@begin@parbox\vbox
\let\@end@parbox\relax
\else
- \def\@begin@parbox{$\vcenter}%
- \def\@end@parbox{\m@th$}%
+ \ifmmode
+ \let\@begin@parbox\vcenter\let\@end@parbox\relax
+ \else
+ \def\@begin@parbox{\null$\vcenter}%
+ \def\@end@parbox{\m@th$\null}%
+ \fi
\fi\fi
\fi\fi
\fi\fi%
\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
%%% 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\count@=\ltjgetparameter{direction}}{}{}
\def\@startpbox##1{\bgroup
\box@dir\adjustbaseline%%% これを追加
\hsize=##1\@arrayparboxrestore
\def\p@array<##1>[##2]##3{%
\let\box@dir\relax
\if ##1z\relax
- \ifnum\ltjgetparameter{direction}=3\relax
+ \ifnum\count@=3\relax
\let\box@dir\utod\@tempcnta=\zstrutbox
\fi
\else
\fi\fi\fi\fi
\fi
\ifx\box@dir\relax
- \ifcase\ltjgetparameter{direction}
+ \ifcase\count@
\or \let\box@dir\dtou\@tempcnta=\tabskip \z@\tabskip \z@\dstrutbox% dtou
\or\or\let\box@dir\tate\@tempcnta=\tstrutbox% tate
\or \let\box@dir\yoko\@tempcnta=\strutbox% yoko
\let\@sharp####\let\protect\relax
\let\\\@arraycr\let\tabularnewline\\\let\par\@empty
\lineskip\z@skip\baselineskip\z@skip\@preamble}
- \def\endarray{\crcr\egroup\egroup\@end@alignbox}
+ \def\endarray{\crcr\egroup\egroup\@end@alignbox\@arrayright}
}
\@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
\ No newline at end of file
+\endinput
OSDN Git Service
