From d7d6de5b9de5d5d8a6d6b740ae5f7d4101e5e40d Mon Sep 17 00:00:00 2001
From: Norbert Preining <norbert@preining.info>
Date: Thu, 8 Oct 2020 03:02:49 +0000
Subject: CTAN sync 202010080302

---
 language/japanese/platex/plext.dtx | 65 ++++++++++++++++++++++++++------------
 1 file changed, 44 insertions(+), 21 deletions(-)

(limited to 'language/japanese/platex/plext.dtx')

diff --git a/language/japanese/platex/plext.dtx b/language/japanese/platex/plext.dtx
index 438cf7c043..023a3db05e 100644
--- a/language/japanese/platex/plext.dtx
+++ b/language/japanese/platex/plext.dtx
@@ -3,7 +3,7 @@
 %
 %  Copyright 2001 ASCII Corporation.
 %  Copyright (c) 2010 ASCII MEDIA WORKS
-%  Copyright (c) 2016-2019 Japanese TeX Development Community
+%  Copyright (c) 2016-2020 Japanese TeX Development Community
 %
 %  This file is part of the pLaTeX2e system (community edition).
 %  -------------------------------------------------------------
@@ -83,6 +83,9 @@
 %    $BD>8r$9$k>l9g$K!"?<$5$rK:$l$F$$$?%P%0=$@5(B (forum:2506, issue~76)}
 % \changes{v1.2l}{2019/09/29}{Make \cs{bou} robust}
 % \changes{v1.2l}{2019/09/29}{Make \cs{kasen} robust}
+% \changes{v1.2m}{2020/10/07}{$B%^%/%mDI2C(B}
+% \changes{v1.2m}{2020/10/07}{Use \cs{@defaultunitsset} (gh/372)
+%    (sync with ltpictur.dtx 2020/08/14 v1.2a)}
 % \fi
 %
 % \iffalse
@@ -91,7 +94,7 @@
 \ProvidesFile{plext.dtx}
 %</driver>
 %<package>\ProvidesPackage{plext}
-   [2019/09/29 v1.2l pLaTeX package file (community edition)]
+   [2020/10/07 v1.2m pLaTeX package file (community edition)]
 %<*driver>
 \documentclass{jltxdoc}
 \usepackage{plext}
@@ -754,12 +757,12 @@
 %    \end{macrocode}
 % $B:G8e$K(B|\@captionbox|$B$rAH$_N)$F$^$9!#(B
 %
-% $B0LCV#2%*%W%7%g%s$,(B`|u|'$B$+(B`|d|'$B$N>l9g!"(B
+% $B0LCV(B2$B%*%W%7%g%s$,(B`|u|'$B$+(B`|d|'$B$N>l9g!"(B
 % $B$3$N%\%C%/%9$NI}$r%U%m!<%H%*%V%8%'%/%H$NI}$HF1$8D9$5$K$7!"(B
-% $B0LCV#1%*%W%7%g%s$G$NB7$($KAH$_N)$F$^$9!#(B
+% $B0LCV(B1$B%*%W%7%g%s$G$NB7$($KAH$_N)$F$^$9!#(B
 %
-% $B0LCV#2%*%W%7%g%s$,(B`|l|'$B$+(B`|r|'$B$N>l9g$O!"%-%c%W%7%g%s$NI}$G$9!#(B
-% $B$3$N$H$-$N0LCV#1%*%W%7%g%s$NB7$($O!"$3$NA0$NCJ3,$G=`Hw$r$7$F$*$-!"(B
+% $B0LCV(B2$B%*%W%7%g%s$,(B`|l|'$B$+(B`|r|'$B$N>l9g$O!"%-%c%W%7%g%s$NI}$G$9!#(B
+% $B$3$N$H$-$N0LCV(B1$B%*%W%7%g%s$NB7$($O!"$3$NA0$NCJ3,$G=`Hw$r$7$F$*$-!"(B
 % |\@pcaption|$B$G:G=*E*$K%U%m!<%H%*%V%8%'%/%H$HAH$_9g$o$;$k$H$-$K$J$5$l$^$9!#(B
 %    \begin{macrocode}
   \let\to@captionboxwidth\relax
@@ -1176,32 +1179,52 @@
 \newdimen\save@tbaselineshift
 \newdimen\@picwd
 %    \end{macrocode}
-% |\picture|$B$NFbIt7A<0$G$9!##3AHL\$N0z?t$O!"86E@:BI8$G$9!#(B
+% \end{macro}
+%
+% \begin{macro}{\X@picture@dimens}
+% $B?^7ANN0h$N@#K!CM$rD4@0$9$kL?Na$r@Z$j=P$7$^$7$?!#(B
+% $B4pK\AH$NAH$_J}8~$HD>8r$9$k>l9g$O!"9b$5$HI}$rF~$lBX$($^$9!#(B
+% \changes{v1.2m}{2020/10/07}{$B%^%/%mDI2C(B}
+%    \begin{macrocode}
+\ifx\@defaultunitsset\@undefined     % old
+  \def\X@picture@dimens#1#2#3#4{%
+    \@picwd=#1\unitlength \@picht=#2\unitlength
+    \@tempdima=#3\unitlength \@tempdimb=#4\unitlength
+  }
+\else                                % 2020-10-01
+  \def\X@picture@dimens#1#2#3#4{%
+    \@defaultunitsset\@picwd{#1}\unitlength
+    \@defaultunitsset\@picht{#2}\unitlength
+    \@defaultunitsset\@tempdima{#3}\unitlength
+    \@defaultunitsset\@tempdimb{#4}\unitlength
+  }
+\fi
+%    \end{macrocode}
+% |\picture|$B$NFbIt7A<0$G$9!#(B3$BAHL\$N0z?t$O!"86E@:BI8$G$9!#(B
+% \changes{v1.2m}{2020/10/07}{Use \cs{@defaultunitsset} (gh/372)
+%    (sync with ltpictur.dtx 2020/08/14 v1.2a)}
 %    \begin{macrocode}
 \def\@@picture<#1>(#2,#3)(#4,#5){%
   \save@ybaselineshift\ybaselineshift
   \save@tbaselineshift\tbaselineshift
   \iftdir
     \if#1y\let\box@dir\yoko
-      \@picwd=#3\unitlength \@picht=#2\unitlength
-      \@tempdima=#5\unitlength \@tempdimb=#4\unitlength
+      \X@picture@dimens{#3}{#2}{#5}{#4}%
     \else\let\box@dir\tate
-      \@picwd=#2\unitlength \@picht=#3\unitlength
-      \@tempdima=#4\unitlength \@tempdimb=#5\unitlength
+      \X@picture@dimens{#2}{#3}{#4}{#5}%
     \fi
   \else
     \if#1t\let\box@dir\tate
-      \@picwd=#3\unitlength \@picht=#2\unitlength
-      \@tempdima=#5\unitlength \@tempdimb=#4\unitlength
+      \X@picture@dimens{#3}{#2}{#5}{#4}%
     \else\let\box@dir\yoko
-      \@picwd=#2\unitlength \@picht=#3\unitlength
-      \@tempdima=#4\unitlength \@tempdimb=#5\unitlength
+      \X@picture@dimens{#2}{#3}{#4}{#5}%
     \fi
   \fi
-  \setbox\@picbox\hbox to\@picwd\bgroup\box@dir
-  \hskip-\@tempdima\lower\@tempdimb\hbox\bgroup
-  \ybaselineshift\z@ \tbaselineshift\z@
-  \ignorespaces}
+  \setbox\@picbox\hb@xt@\@picwd\bgroup\box@dir
+    \hskip-\@tempdima
+    \lower\@tempdimb\hbox\bgroup
+      \ybaselineshift\z@ \tbaselineshift\z@
+      \ignorespaces}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -1263,7 +1286,7 @@
 % $B!XF|K\8l(B\LaTeXe{}$B%V%C%/!Y$r;2>H$7$F$/$@$5$$!#(B
 % $B$J$*!"K5E@$K;H$&J8;z$O(B\file{pldefs.ltx}$B$GDj5A$5$l$F$$$^$9!#(B
 %
-% $B$J$*!"O"?t;z%3%^%s%I$O#3<oN`$"$j$^$7$?$,!"(B
+% $B$J$*!"O"?t;z%3%^%s%I$O(B3$B<oN`$"$j$^$7$?$,!"(B
 % |\rensuji|$B%3%^%s%I0l$D$K$^$H$a$^$7$?!#(B
 % $B?7$7$$O"?t;z%3%^%s%I$O<!$N9=J8$H$J$j$^$9!#(B
 %
@@ -1285,7 +1308,7 @@
 %    \end{macrocode}
 %
 % |\rensujiskip|$B$OO"?t;z$NA08e$KF~$k%"%-$G$9!#(B
-% $B%G%U%)%k%H$O!"8=:_$NJ8;z$NI}$N#4J,$N#1$r4p=`$K$7$F$$$^$9!#(B
+% $B%G%U%)%k%H$O!"8=:_$NJ8;z$NI}$N(B4$BJ,$N(B1$B$r4p=`$K$7$F$$$^$9!#(B
 %    \begin{macrocode}
 \newskip\rensujiskip
 \rensujiskip=0.25\chs plus.25zw minus.25zw
-- 
cgit v1.2.3

