diff options
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/lltjext.sty')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/lltjext.sty | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty b/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty index 79030f7c67a..b814bbe3bf3 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjext}[2015/09/18 v1.2-ltj-4 Macros for vertical writing] +\ProvidesPackage{lltjext}[2016/12/16 v1.2c-ltj-5 Macros for vertical writing] \RequirePackage{luatexja} {\catcode`\*=11 @@ -23,7 +23,9 @@ {\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 \let\@classz\@tabclassz @@ -302,9 +304,9 @@ \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{% @@ -342,8 +344,7 @@ \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 @@ -353,16 +354,16 @@ \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<%> {\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{% @@ -370,10 +371,10 @@ \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\relax\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 @@ -609,10 +610,10 @@ \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 @@ -762,5 +763,9 @@ \AtEndOfPackageFile{array}{\ltj@lltjext@patch@array} } +%%%%%%%%%%%%%%%% LuaTeX-ja original + +\define@key[ltj]{japaram}{autouprightnum}{% %COUNT + \ltj@@set@stack{AURN}{0}{10000}\z@#1 } \endinput |