lltjext: \count@ -> new count register

diff --git a/src/lltjext.sty b/src/lltjext.sty
index cc8f8a4..3991f4b 100644 (file)
--- a/src/lltjext.sty
+++ b/src/lltjext.sty
@@ -5,7 +5,7 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{lltjext}[2017/05/05 v1.2g-ltj-5 Macros for vertical writing]
 \RequirePackage{luatexja}
-
+\newcount\ltj@ext@dir
 {\catcode`\*=11
 \global\let\ltj@lltjext@orig@tabularS=\tabular*
 }%
@@ -15,19 +15,20 @@
 %%% 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>}}
+   {\@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 
-   \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[%]
@@ -36,7 +37,7 @@
 \def\p@array<#1>[#2]#3{%
   \let\box@dir\relax
   \if #1z\relax
-    \ifnum\count@=3\relax
+    \ifnum\ltj@ext@dir=3\relax
       \let\box@dir\utod\@tempcnta=\zstrutbox
     \fi
   \else
@@ -51,7 +52,7 @@
     \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=\ystrutbox% yoko
@@ -798,7 +799,9 @@
 
 \def\ltj@lltjext@patch@array{%
   \patchcmd{\@tabular}{\hbox\bgroup}{%
-       \hbox\bgroup\count@=\ltjgetparameter{direction}}{}{}
+       \hbox\bgroup\ltj@ext@dir=\ltjgetparameter{direction}}{}{}
+  \pretocmd{\@array}%
+       {\ltj@ext@dir=\ltjgetparameter{direction}\relax}{}{}
   \def\@startpbox##1{\bgroup
    \box@dir\adjustbaseline%%% これを追加
    \hsize=##1\@arrayparboxrestore
@@ -806,11 +809,11 @@
         \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\count@=3\relax
+      \ifnum\ltj@ext@dir=3\relax
         \let\box@dir\utod\@tempcnta=\zstrutbox
       \fi
     \else
@@ -825,7 +828,7 @@
       \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=\ystrutbox% yoko