X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Flltjext.sty;h=02557dcc5733ddb3b0dd492fa151a923a9781319;hb=01b7cb68e6df7a7dbe9cb9015aa374e5194ff8a1;hp=3de4fdc4b5f364b7e39a99a1ea7eb73aaec4865f;hpb=e747a84f1f8fefa302b9c163fd6ba57acfa097eb;p=luatex-ja%2Fluatexja.git

diff --git a/src/lltjext.sty b/src/lltjext.sty
index 3de4fdc..02557dc 100644
--- a/src/lltjext.sty
+++ b/src/lltjext.sty
@@ -3,9 +3,12 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjext}[2014/10/15 v1.2-ltj-3 Macros for vertical writing]
+\ProvidesPackage{lltjext}[2015/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
 
@@ -20,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
@@ -299,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{%
@@ -339,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
@@ -350,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{%
@@ -367,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
@@ -606,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
@@ -743,19 +747,25 @@
       \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}
   \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