From: Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Date: Wed, 30 Sep 2020 15:14:18 +0000 (+0900)
Subject: small fix
X-Git-Tag: 20201001.0~2
X-Git-Url: http://git.osdn.net/view?p=luatex-ja%2Fluatexja.git;a=commitdiff_plain;h=5c5e1d9a1c87a684f5c03301037fa1e1c69b6d45;ds=sidebyside

small fix
---

diff --git a/src/lltjext.sty b/src/lltjext.sty
index fa3d072..9fe18f4 100644
--- a/src/lltjext.sty
+++ b/src/lltjext.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjext}[2019/09/25 v1.2k-ltj-11 Macros for vertical writing]
+\ProvidesPackage{lltjext}[2020-09-30 v1.2k-ltj-12 Macros for vertical writing]
 \RequirePackage{luatexja}
 \newcount\ltj@ext@dir
 \let\ltj@lltjext@orig@tabular=\tabular
@@ -538,9 +538,17 @@
        \else \let\box@dir\utod
     \fi
   \fi
+\ifltj@ltfilehook@avail % LaTeX2e >= 2020-10-01
+  \@defaultunitsset\@picht{#3}\unitlength
+  \@defaultunitsset\@picwd{#2}\unitlength
+  \setbox\@picbox\hbox to\@picwd\bgroup\box@dir
+    \@defaultunitsset\@tempdimc{#4}\unitlength\hskip-\@tempdimc
+    \@defaultunitsset\@tempdimc{#5}\unitlength\lower\@tempdimc\hbox\bgroup
+\else % <= 2020-02-02
   \@picwd=#2\unitlength \@picht=#3\unitlength
   \setbox\@picbox\hbox to\@picwd\bgroup\box@dir
   \hskip-#4\unitlength\lower#5\unitlength\hbox\bgroup
+\fi
   \ltj@@pic@reset@blshift
   \ignorespaces}
 \def\endpicture{%
diff --git a/src/ltj-latex.sty b/src/ltj-latex.sty
index c5df0ff..834f16e 100644
--- a/src/ltj-latex.sty
+++ b/src/ltj-latex.sty
@@ -12,7 +12,7 @@
 \def\luatexjalatexLoaded{\endinput}
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ltj-latex}[2020-09-27 LaTeX support of LuaTeX-ja]
+\ProvidesPackage{ltj-latex}[2020-10-01 LaTeX support of LuaTeX-ja]
 
 % cleanup at end of the document
 %\let\ltj@@orig@end=\@@end
@@ -86,8 +86,10 @@
 \ltj@pkgpatch{tascmac}
 \ltj@pkgpatch{ascmac}[lltjp-tascmac]
 \ltj@pkgpatch@im{stfloats}
-\ltj@pkgpatch{preview}  %% at \begin{document}
+\ifltj@ltfilehook@avail\else
+  \ltj@pkgpatch{preview}  %% at \begin{document}
   % (preview package has delayed option)
+\fi
 \ltj@pkgpatch{array}    %% at \begin{document}
 \ltj@pkgpatch{collcell} %% at \begin{document}
 \ltj@pkgpatch@im{unicode-math}
diff --git a/src/patches/lltjp-preview.sty b/src/patches/lltjp-preview.sty
index 0060288..b850ec3 100644
--- a/src/patches/lltjp-preview.sty
+++ b/src/patches/lltjp-preview.sty
@@ -3,20 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-preview}[2018/01/20 Patch to preview for LuaTeX-ja]
-
-\RequirePackage{etoolbox,preview}
-\newbox\ltj@preview@box
-
-\patchcmd\pr@endbox{%
-   \pr@ship@end
-}{%
-   \setbox\ltj@preview@box=\box\AtBeginShipoutBox
-   \setbox\AtBeginShipoutBox=\vbox{\yoko\box\pr@box}%
-   \directlua{luatexja.direction.finalize()}%
-   \setbox\pr@box=\box\AtBeginShipoutBox
-   \setbox\AtBeginShipoutBox=\box\ltj@preview@box
-   \pr@ship@end
-}{}{}
-
+\ProvidesPackage{lltjp-preview}[2020-10-01 Patch to preview for LuaTeX-ja]
+\RequirePackage{preview}
+\let\pr@shipout=\ltj@shipout
 \endinput
diff --git a/test/test56-lltjext-picture.pdf b/test/test56-lltjext-picture.pdf
index f7c0d44..202c125 100644
Binary files a/test/test56-lltjext-picture.pdf and b/test/test56-lltjext-picture.pdf differ
diff --git a/test/test56-lltjext-picture.tex b/test/test56-lltjext-picture.tex
index 4d0a8ce..657ba62 100644
--- a/test/test56-lltjext-picture.tex
+++ b/test/test56-lltjext-picture.tex
@@ -8,6 +8,7 @@
 \usepackage{plext}
 \usepackage[dvipdfmx]{xcolor}
 \fi
+\usepackage{pict2e}
 \usepackage[margin=20mm]{geometry}
 \unitlength6mm\fboxsep0mm
 
@@ -16,7 +17,7 @@
   \hbox{#1\color{#3}%
     \vrule width 150pt height .2pt depth .2pt\kern-150pt
     \normalsize あいうABCxyz%
-    \fbox{\begin{picture}<#2>(5,4)(1,2)
+    \fbox{\begin{picture}<#2>(1cm+3cm,4)(1,2)
       \put(0,0){\circle*{0.2}}
       \put(0,0){\vector(0,1){1}}
       \put(1,0){\makebox(0,0)[l]{\scriptsize$x$}}