lltjext.sty: removed unnecessary \typeout

[luatex-ja/luatexja.git] / src / lltjext.sty

diff --git a/src/lltjext.sty b/src/lltjext.sty
index c6412af..7a445f5 100644 (file)
--- a/src/lltjext.sty
+++ b/src/lltjext.sty
@@ -36,7 +36,7 @@
 \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
@@ -656,7 +656,7 @@
 
 %%% kanji
 \def\Kanji#1{\expandafter\@Kanji\csname c@#1\endcsname}
-\def\@Kanji#1{\expandafter\kansuji\number #1\relax}
+\def\@Kanji#1{\kansuji #1}
 \def\kanji{\ifnum\ltjgetparameter{direction}=3 \expandafter\kansuji\fi}
 
 %%% bou
@@ -688,7 +688,7 @@
 
 %%% 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}}}
@@ -696,6 +696,8 @@
 %% 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
@@ -707,7 +709,7 @@
   \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
@@ -722,7 +724,7 @@
       \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
@@ -759,7 +761,7 @@
   \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}
 }