OSDN Git Service

sync with platex/5ebffbf3
[luatex-ja/luatexja.git] / src / lltjext.sty
index 3be9e3e..1da5aad 100644 (file)
@@ -1,12 +1,17 @@
 %
 % lltjext.sty: derived from plext.sty in pLaTeX.
 %
+
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjext}
-   [2014/07/26 v1.2-ltj-1 ...]
+\ProvidesPackage{lltjext}[2016/12/16 v1.2c-ltj-5 Macros for vertical writing]
 \RequirePackage{luatexja}
 
-\newif\if@rotsw
+{\catcode`\*=11
+\global\let\ltj@lltjext@orig@tabularS=\tabular*
+}%
+\let\ltj@lltjext@orig@tabular=\tabular
+\let\ltj@lltjext@orig@array=\array
+
 %%% array and tabular
 \def\array{\let\@acol\@arrayacol \let\@classz\@arrayclassz
  \let\@classiv\@arrayclassiv
    {\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[%]
@@ -43,7 +51,7 @@
     \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
           \@depth\arraystretch\ltjgetdp\@tempcnta \@width\z@}%
   \fork@array@option<#1>[#2]%
   \@mkpream{#3}\edef\@preamble{\ialign \noexpand\@halignto
-  \bgroup \tabskip\z@skip \@arstrut \@preamble \tabskip\z@skip \cr}%
-  \let\@startpbox\@@startpbox \let\@endpbox\@@endpbox
-  \let\tabularnewline\\%
+  \bgroup\@arstrut \@preamble \tabskip\z@skip \cr}%
+   \let\tabularnewline\\%
   \@begin@alignbox\bgroup\box@dir\adjustbaseline
     \let\par\@empty
     \let\@sharp##\let\protect\relax
     \lineskip\z@skip\baselineskip\z@skip\@preamble}
 \def\endarray{\crcr\egroup\egroup\@end@alignbox}
-\def\endtabular{\crcr\egroup\egroup\@end@alignbox$\egroup}
+\def\endtabular{\endarray$\egroup}
 \expandafter \let \csname endtabular*\endcsname = \endtabular
 \def\fork@array@option<#1>[#2]{%
 \ifnum\ltjgetparameter{direction}=4 % 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<%>
    {\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{%
   \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
 \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
     \setbox\z@\hbox{\yoko#2}%
     \@tempdima\ltjgetht\z@ \advance\@tempdima\ltjgetdp\z@
     \ifnum\ltjgetparameter{direction}=1\relax
-      \if #1c\relax\vrule \@width \z@ \@height.5\@tempdima \@depth.5\@tempdima
-      \else\if #1l\relax\vrule\@width \z@\@height\z@ \@depth\@tempdima
-      \else\vrule\@width \z@ \@height\@tempdima \@depth\z@
+      % 周囲が dtou の場合には,高さ \ltjgetht\tw@, 深さ \ltjgetdp\tw@ のボックスを基準としている.
+      \if #1c\relax\vrule \@width \z@ \@height\dimexpr.5\@tempdima+.5\ltjgetht\tw@-.5\ltjgetdp\tw@
+                          \@depth\dimexpr.5\@tempdima-.5\ltjgetht\tw@+.5\ltjgetdp\tw@
+      \else\if #1l\relax\vrule\@width \z@\@height\ltjgetht\tw@ \@depth\dimexpr\@tempdima-\ltjgetht\tw@
+      \else\vrule\@width \z@ \@height\dimexpr\@tempdima-\ltjgetdp\tw@ \@depth\ltjgetdp\tw@
       \fi\fi
     \else
-      \if #1c\relax\vrule \@width \z@ \@height.5\@tempdima \@depth.5\@tempdima
-      \else\if #1r\relax\vrule\@width \z@\@height\z@ \@depth\@tempdima
-      \else\vrule\@width \z@ \@height\@tempdima \@depth\z@
+      % 周囲が tate, utod の場合も同じ
+      \if #1c\relax\vrule \@width \z@ \@height\dimexpr.5\@tempdima+.5\ltjgetht\tw@-.5\ltjgetdp\tw@
+                          \@depth\dimexpr.5\@tempdima-.5\ltjgetht\tw@+.5\ltjgetdp\tw@
+      \else\if #1r\relax\vrule\@width \z@\@height\ltjgetht\tw@ \@depth\dimexpr\@tempdima-\ltjgetht\tw@
+      \else\vrule\@width \z@ \@height\dimexpr\@tempdima-\ltjgetdp\tw@ \@depth\ltjgetdp\tw@
       \fi\fi
     \fi
   \fi
   \ifnum\ltjgetparameter{direction}=1\relax
-    \if #1c\relax\hbox to\zw{\yoko\hss#2\hss}%
-    \else\if #1r\relax\vbox{\hbox to\zw{\yoko\hss#2}\kern\z@}%
-    \else\vtop{\kern\z@\hbox to\zw{\yoko#2\hss}}%
+    \if #1c\relax\hbox to\@tempdimb{\yoko\hss#2\hss\kern-\ltjgetdp\tw@}%
+    \else\if #1r\relax\vbox{\hbox to\@tempdimb{\yoko\hss#2\kern-\ltjgetdp\tw@}}%
+    \else\lower\ltjgetdp\tw@\vtop{\hbox to\@tempdimb{\yoko#2\hss}}%
     \fi\fi
   \else
-    \if #1c\relax\hbox to\zw{\yoko\hss#2\hss}%
-    \else\if #1r\relax\vtop{\kern\z@\hbox to\zw{\yoko\hss#2}}%
-    \else\vbox{\hbox to\zw{\yoko #2\hss}\kern\z@}%
+    \if #1c\relax\raise\dimexpr.5\@tempdimb-\ltjgetdp\tw@
+        \hbox to\@tempdimb{\yoko \hss#2\hss}%
+    \else\if #1r\relax\raise\dimexpr.5\@tempdimb-\ltjgetdp\tw@
+        \vbox{\hbox to\@tempdimb{\yoko\hss#2}}%
+    \else\raise\dimexpr.5\@tempdimb-\ltjgetdp\tw@
+         \vtop{\hbox to\@tempdimb{\yoko #2\hss}}%
     \fi\fi
   \fi
   \hskip\rensujiskip
 
 %%% kanji
 \def\Kanji#1{\expandafter\@Kanji\csname c@#1\endcsname}
-\def\@Kanji#1{\expandafter\kansuji\number #1}
-\def\kanji{\iftdir\expandafter\kansuji\fi}
+\def\@Kanji#1{\kansuji #1}
+\def\kanji{\ifnum\ltjgetparameter{direction}=3 \expandafter\kansuji\fi}
 
 %%% bou
-%%% 
-\def\boutenchar{\char\euc"A1A2}
+%%%
+\def\boutenchar{\char\euc"A1A2}%"
 \def\bou#1{\ifvmode\leavevmode\fi\@bou#1\end}
 \def\@bou#1{%
   \ifx#1\end \let\next=\relax
   \else (\theequation)\fi}}
 \def\@thecounter#1{\noexpand\rensuji{\noexpand\arabic{#1}}}
 \def\@thmcounter#1{\noexpand\rensuji{\noexpand\arabic{#1}}}
-\endinput
\ No newline at end of file
+
+%% Compatibility with array package
+
+\def\ltj@lltjext@patch@array{%
+  \def\@startpbox##1{\bgroup
+   \box@dir\adjustbaseline%%% これを追加
+   \hsize=##1\@arrayparboxrestore
+     \everypar{%
+        \vrule \@height \ltjgetht\@arstrutbox \@width \z@
+        \everypar{}}%
+     }
+  \def\@tabarray{\@ifnextchar<\p@tabarray{\p@tabarray<Z>}}
+  \def\p@array<##1>[##2]##3{%
+    \let\box@dir\relax
+    \if ##1z\relax
+      \ifnum\ltjgetparameter{direction}=3\relax
+        \let\box@dir\utod\@tempcnta=\zstrutbox
+      \fi
+    \else
+      \if ##1y\relax
+        \let\box@dir\yoko\@tempcnta=\strutbox
+      \else\if ##1t\relax
+        \let\box@dir\tate\@tempcnta=\tstrutbox
+      \else\if ##1d\relax
+         \let\box@dir\dtou\@tempcnta=\dstrutbox
+      \else\if ##1u\relax
+         \let\box@dir\utod\@tempcnta=\zstrutbox
+      \fi\fi\fi\fi
+    \fi
+    \ifx\box@dir\relax
+      \ifcase\ltjgetparameter{direction}
+         \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
+         \else \let\box@dir\utod\@tempcnta=\zstrutbox% utod
+      \fi
+    \fi
+    \setbox \@arstrutbox \hbox{\box@dir\vrule
+               \@height \arraystretch
+                 \dimexpr \ltjgetht\@tempcnta+\extrarowheight\relax
+               \@depth \arraystretch \ltjgetdp \@tempcnta
+               \@width \z@}%
+    \fork@array@option<##1>[##2]%
+    \begingroup
+    \@mkpream{##3}%
+    \xdef\@preamble{\ialign \noexpand \@halignto
+                    \bgroup \tabskip \z@skip \@arstrut \@preamble
+                            \tabskip \z@ \cr}%
+    \endgroup
+    \@arrayleft
+    \@begin@alignbox\bgroup\box@dir\adjustbaseline
+      \let\par\@empty
+      \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\@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