lltjp-array and lltjext were clashed

diff --git a/doc/luatexja-en.pdf b/doc/luatexja-en.pdf
index 7bf6ffa..aee15e1 100644 (file)
Binary files a/doc/luatexja-en.pdf and b/doc/luatexja-en.pdf differ

diff --git a/doc/luatexja-ja.pdf b/doc/luatexja-ja.pdf
index 8da5094..bfeda2a 100644 (file)
Binary files a/doc/luatexja-ja.pdf and b/doc/luatexja-ja.pdf differ

diff --git a/doc/luatexja.dtx b/doc/luatexja.dtx
index 15aaaac..8da955d 100644 (file)
--- a/doc/luatexja.dtx
+++ b/doc/luatexja.dtx
@@ -3584,6 +3584,28 @@ JFM中における \texttt{kanjiskip\_natural}, \texttt{kanjiskip\_stretch},\
 3キーは再び有効化される．\texttt{-ltjksp}, \texttt{+ltjksp} を複数回指定した場合は，
 最後に指定したものが有効となる．
 %</ja>
+%<*en>
+\paragraph{\texttt{ltjksp}}
+\label{pg:ltjksp}
+\texttt{kanjiskip\_natural}, \texttt{kanjiskip\_stretch},\
+\texttt{kanjiskip\_shrink} keys (Page~\pageref{pg:ksp_nat}) makes tha
+\LuaTeX-ja inserts not only a glue which is specified by a JFM, and also
+the natural width/stretch part/shrink part of \Param{kanjiskip}.
+
+This functionality is disabled by \texttt{-ltjksp} specification.
+\begin{LTXexample}[width=16\zw]
+\leavevmode
+\ltjsetparameter{kanjiskip=0pt plus 3\zw}
+\vrule\hbox to 15\zw{あ「い」う，えお}\vrule
+
+\jfont\G=file:KozMinPr6N-Regular.otf%
+  :jfm=ujis;-ltjksp at 9.2487pt
+\G\leavevmode%
+\vrule\hbox to 15\zw{あ「い」う，えお}\vrule
+\end{LTXexample}
+%</en>
+
+
 
 
 %<en>\subsection{\cs{tfont}}
@@ -4382,7 +4404,7 @@ Hence we have the following result:
 
 \end{cslist}
 %</en>
-
+  
 \item[end\_stretch=<kern>, end\_shrink=<kern>]
 %<*ja>
 （任意，バージョン1のみ）

diff --git a/src/lltjext.sty b/src/lltjext.sty
index 3393853..13f2d62 100644 (file)
--- a/src/lltjext.sty
+++ b/src/lltjext.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjext}[2017/08/27 v1.2g-ltj-8 Macros for vertical writing]
+\ProvidesPackage{lltjext}[2018/03/29 v1.2g-ltj-9 Macros for vertical writing]
 \RequirePackage{luatexja}
 \newcount\ltj@ext@dir
 {\catcode`\*=11
@@ -28,7 +28,8 @@
    \setlength\dimen@{#2}%
    \edef\@halignto{to\the\dimen@}\p@tabular<#1>}
 \def\p@tabular<#1>{\leavevmode \hbox \bgroup 
-   \ltj@ext@dir=\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[%]
@@ -651,7 +652,7 @@
 
 \def\ltj@lltjext@patch@array{%
   \patchcmd{\@tabular}{\hbox\bgroup}{%
-       \hbox\bgroup\ltj@ext@dir=\ltjgetparameter{direction}}{}{}
+       \hbox\bgroup\ltj@ext@dir=\ltjgetparameter{direction}}{\typeout{SUCC}}{}
   \pretocmd{\array}%
        {\ltj@ext@dir=\ltjgetparameter{direction}\relax}{}{}
   \def\@startpbox##1{\bgroup

diff --git a/src/luatexja-compat.sty b/src/luatexja-compat.sty
index 2511280..f55bf51 100644 (file)
--- a/src/luatexja-compat.sty
+++ b/src/luatexja-compat.sty
@@ -65,7 +65,7 @@
   \expandafter\let\csname ifltj@in@latex\expandafter\endcsname
     \csname iftrue\endcsname
   \NeedsTeXFormat{LaTeX2e}
-  \ProvidesPackage{luatexja-compat}[2017/05/05 Compatibility with pTeX]
+  \ProvidesPackage{luatexja-compat}[2018/03/29 Compatibility with pTeX]
 \fi                             %</LaTeX>
 
 % Load core module if not yet.

diff --git a/src/luatexja.sty b/src/luatexja.sty
index 9f7604e..f79f671 100644 (file)
--- a/src/luatexja.sty
+++ b/src/luatexja.sty
@@ -34,10 +34,10 @@
   \expandafter\let\csname ifltj@in@latex\expandafter\endcsname
     \csname iftrue\endcsname
   \NeedsTeXFormat{LaTeX2e}
-  \ProvidesPackage{luatexja}[2018/03/25 Japanese Typesetting with Lua(La)TeX]
+  \ProvidesPackage{luatexja}[2018/03/29 Japanese Typesetting with Lua(La)TeX]
 \fi                             %</LaTeX>
 %%%% VERSION
-\def\LuaTeXjaversion{20180325.0}
+\def\LuaTeXjaversion{20180329.0}
 
 \directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs
 

diff --git a/src/patches/lltjp-array.sty b/src/patches/lltjp-array.sty
index 94a5318..4cc3d0c 100644 (file)
--- a/src/patches/lltjp-array.sty
+++ b/src/patches/lltjp-array.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-array}[2018/03/25 Patch to array for LuaTeX-ja]
+\ProvidesPackage{lltjp-array}[2018/03/29 Patch to array for LuaTeX-ja]
 
 \RequirePackage{etoolbox,array,luatexja}
 
@@ -13,6 +13,7 @@
    \ltj@sharp
 }{}{}
 
+\@ifpackageloaded{lltjext}{}{%
 %% remove extra \xkanjiskip (pLaTeX2e 2016/04/17)
 \def\@tabular{%
            \leavevmode \null
@@ -21,5 +22,5 @@
            \@tabarray}
 \def\endtabular{\endarray $\egroup\null}
 \expandafter \let \csname endtabular*\endcsname = \endtabular
-
+}
 \endinput