platex-tools (14oct20)

git-svn-id: svn://tug.org/texlive/trunk@56661 c570f23f-e606-0410-a88d-b1316a301751

20 files changed, 216 insertions, 20 deletions

diff --git a/Master/texmf-dist/doc/latex/platex-tools/README.md b/Master/texmf-dist/doc/latex/platex-tools/README.md
index 903bb76ee3e..99a92286e7a 100644
--- a/Master/texmf-dist/doc/latex/platex-tools/README.md
+++ b/Master/texmf-dist/doc/latex/platex-tools/README.md
@@ -7,56 +7,56 @@ and some additional packages are included.
 
 ## Bundle contents
 
+All these packages can be used on pLaTeX and upLaTeX.
+
+- pldocverb.sty:
+    Patch for doc.sty (latex) to improve
+    compatibility with `\verb` redefinition in pLaTeX.
 - plarray.sty:
     Patch for array.sty (latex-tools) to improve
-    compatibility with pLaTeX/upLaTeX kernels.
-    Can be used on pLaTeX/upLaTeX.
+    compatibility with pLaTeX kernel.
 - plextarray.sty:
     Patch for array.sty (latex-tools) to improve
     compatibility with plext.sty in pLaTeX.
-    Can be used on pLaTeX/upLaTeX.
 - plextdelarray.sty:
     Patch for delarray.sty (latex-tools) to improve
     compatibility with plext.sty in pLaTeX.
-    Can be used on pLaTeX/upLaTeX.
+- plextcolortbl.sty:
+    Patch for colortbl.sty (by David Carlisle) to improve
+    compatibility with plext.sty in pLaTeX.
 - pxftnright.sty:
     Patch for ftnright.sty (latex-tools) to support
     Japanese classes for vertical writing.
-    Can be used on pLaTeX/upLaTeX.
 - pxmulticol.sty:
     Patch for multicol.sty (latex-tools) to support
     `\footnote` in vertical writing.
-    Can be used on pLaTeX/upLaTeX.
 - pxxspace.sty:
     Patch for xspace.sty (latex-tools) to fix
     interword spacing with Japanese characters.
-    Can be used on pLaTeX/upLaTeX.
     Version 0.2 was written by Takayuki YATO in 2019
     (https://gist.github.com/zr-tex8r/7de76036846e149bc28ec6399a683e3a),
     and incorporated into this bundle by his courtesy.
 - pxeverysel.sty:
     Patch for everysel.sty (ms) to improve
     compatibility with Japanese font selection in pLaTeX.
-    Can be used on pLaTeX/upLaTeX.
     Version 0.1 was written by Takayuki YATO in 2015
     (https://gist.github.com/zr-tex8r/48c6910bbbe2f41d72de),
     and incorporated into this bundle by his courtesy.
 - pxeveryshi.sty:
     Patch for everyshi.sty (ms) to support
     Japanese classes for vertical writing.
-    Can be used on pLaTeX/upLaTeX.
     Version 0.1 was written by Takayuki YATO in 2012
     (https://gist.github.com/zr-tex8r/2702969),
     and incorporated into this bundle by his courtesy.
 - pxatbegshi.sty:
     Patch for atbegshi.sty (oberdiek) to support
     Japanese classes for vertical writing.
-    Can be used on pLaTeX/upLaTeX.
     The essential part of this package was proposed by
     Hironori Kitagawa in 2017.
 
-The packages "pxgentombow", "gentombow" and "bounddvi" are now distributed
-as part of [gentombow](https://github.com/aminophen/gentombow) bundle.
+The packages "gentombow" (formerly "pxgentombow") and "bounddvi"
+are now distributed as part of
+[gentombow](https://github.com/aminophen/gentombow) bundle.
 
 ## Character encoding
 
@@ -83,6 +83,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
 
 ## Release Date
 
-2020-09-27
+2020-10-14
 
 Hironobu Yamashita
diff --git a/Master/texmf-dist/doc/latex/platex-tools/plarray.pdf b/Master/texmf-dist/doc/latex/platex-tools/plarray.pdf
index dfa0afcbf72..27ef3b0f86b 100644
--- a/Master/texmf-dist/doc/latex/platex-tools/plarray.pdf
+++ b/Master/texmf-dist/doc/latex/platex-tools/plarray.pdf
diff --git a/Master/texmf-dist/doc/latex/platex-tools/plarray.tex b/Master/texmf-dist/doc/latex/platex-tools/plarray.tex
index fdb95faf3ec..66ea8f2fb56 100644
--- a/Master/texmf-dist/doc/latex/platex-tools/plarray.tex
+++ b/Master/texmf-dist/doc/latex/platex-tools/plarray.tex
@@ -7,8 +7,6 @@
 \usepackage{doc}
 \usepackage{plarray}
 \GetFileInfo{plarray.sty}
-\makeatletter
-\makeatother
 \title{Package \textsf{plarray} \fileversion}
 \author{Hironobu Yamashita}
 \date{\filedate}
diff --git a/Master/texmf-dist/doc/latex/platex-tools/pldocverb.pdf b/Master/texmf-dist/doc/latex/platex-tools/pldocverb.pdf
new file mode 100644
index 00000000000..480cf59298e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/platex-tools/pldocverb.pdf
diff --git a/Master/texmf-dist/doc/latex/platex-tools/pldocverb.tex b/Master/texmf-dist/doc/latex/platex-tools/pldocverb.tex
new file mode 100644
index 00000000000..e590f4a67d4
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/platex-tools/pldocverb.tex
@@ -0,0 +1,54 @@
+%# -*- coding: utf-8 -*-
+\ifx\epTeXinputencoding\undefined\else % defined in e-pTeX (> TL2016)
+  \epTeXinputencoding utf8    % ensure utf-8 encoding for platex
+\fi
+
+\documentclass[a4paper]{jsarticle}% supports \verb in \footnote
+\usepackage{doc}
+\usepackage{pldocverb}
+\GetFileInfo{pldocverb.sty}
+\title{Package \textsf{pldocverb} \fileversion}
+\author{Hironobu Yamashita}
+\date{\filedate}
+\begin{document}
+
+\maketitle
+
+This package \textsf{pldocverb} provides small patches to
+\textsf{doc} package of \textsf{latex(-base)} for use with
+Japanese p\LaTeX/up\LaTeX.
+Current package supports re-definition of \verb+\verb+ command.
+
+This package is part of \textsf{platex-tools} bundle:
+\begin{verbatim}
+  https://github.com/aminophen/platex-tools
+\end{verbatim}
+
+\bigskip
+
+この\textsf{pldocverb}パッケージは、
+\textsf{latex(-base)}バンドルの\textsf{doc}パッケージによって
+上書きされて無効化されてしまうp\LaTeX/up\LaTeX カーネルの修正点を
+再有効化します。具体的には、\verb+\verb+コマンドの直前に
+\verb+\xkanjiskip+挿入を許可するための修正に対応します。
+
+\bigskip
+\begin{minipage}{0.6\linewidth}
+\noautoxspacing %% on purpose
+\begin{verbatim}
+  \documentclass{jarticle} % if you are using pLaTeX,
+  \usepackage{pldocverb}   % load this!
+  \usepackage{minijs}
+  \begin{document}
+  \setlength{\xkanjiskip}{10pt}
+  これが\verb+test+で\verb+テスト+です。
+  \end{document}
+\end{verbatim}
+\end{minipage}
+\begin{minipage}{0.35\linewidth}
+  \setlength{\xkanjiskip}{10pt}
+  これが\verb+test+で\verb+テスト+です。
+\end{minipage}
+\bigskip
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/platex-tools/plextarray.pdf b/Master/texmf-dist/doc/latex/platex-tools/plextarray.pdf
index 6ebd30fceee..ebf6a7aa511 100644
--- a/Master/texmf-dist/doc/latex/platex-tools/plextarray.pdf
+++ b/Master/texmf-dist/doc/latex/platex-tools/plextarray.pdf
diff --git a/Master/texmf-dist/doc/latex/platex-tools/plextcolortbl.pdf b/Master/texmf-dist/doc/latex/platex-tools/plextcolortbl.pdf
new file mode 100644
index 00000000000..10e8857f5e8
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/platex-tools/plextcolortbl.pdf
diff --git a/Master/texmf-dist/doc/latex/platex-tools/plextcolortbl.tex b/Master/texmf-dist/doc/latex/platex-tools/plextcolortbl.tex
new file mode 100644
index 00000000000..0cea5c10934
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/platex-tools/plextcolortbl.tex
@@ -0,0 +1,64 @@
+%# -*- coding: utf-8 -*-
+\ifx\epTeXinputencoding\undefined\else % defined in e-pTeX (> TL2016)
+  \epTeXinputencoding utf8    % ensure utf-8 encoding for platex
+\fi
+
+\documentclass[a4paper]{jsarticle}
+\usepackage{doc}
+\usepackage{colortbl}
+\usepackage{plextcolortbl}
+\GetFileInfo{plextcolortbl.sty}
+\title{Package \textsf{plextcolortbl} \fileversion}
+\author{Hironobu Yamashita}
+\date{\filedate}
+\begin{document}
+
+\maketitle
+
+The package \textsf{plextcolortbl} provides a tiny patch to
+make \textsf{colortbl} compatible with \textsf{plext}.
+
+\bigskip
+
+\textsf{plextcolortbl}パッケージは、David Carlisle氏による
+\textsf{colortbl}パッケージと、p\LaTeX の拡張パッケージである
+\textsf{plext}パッケージを同時に使えるようにするものです。
+
+\section{使いかた}
+
+\textsf{plext}と\textsf{colortbl}を共存させたいときに、プリアンブルに
+\verb+\usepackage{plextcolortbl}+と書きます。
+
+以下に例を示します。
+
+\bigskip
+\begin{minipage}{0.5\linewidth}
+\begin{verbatim}
+  \documentclass{jsarticle}
+  %\usepackage{plext}
+  %\usepackage{colortbl}
+  \usepackage{plextcolortbl}
+  \begin{document}
+  \begin{tabular*}<t>{3cm}{%
+  @{\extracolsep{\fill}}
+  >{\columncolor{green}[0pt][20mm]}l
+  >{\columncolor{yellow}[5mm][0pt]}l
+  @{}}
+  one & いち \\
+  two & に
+  \end{tabular*}
+  \end{document}
+\end{verbatim}
+\end{minipage}
+\begin{minipage}{0.4\linewidth}
+  \begin{tabular*}<t>{3cm}{%
+  @{\extracolsep{\fill}}
+  >{\columncolor{green}[0pt][20mm]}l
+  >{\columncolor{yellow}[5mm][0pt]}l
+  @{}}
+  one & いち \\
+  two & に
+  \end{tabular*}
+\end{minipage}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/platex-tools/plextdelarray.pdf b/Master/texmf-dist/doc/latex/platex-tools/plextdelarray.pdf
index 81ae06afe01..d45927b87d9 100644
--- a/Master/texmf-dist/doc/latex/platex-tools/plextdelarray.pdf
+++ b/Master/texmf-dist/doc/latex/platex-tools/plextdelarray.pdf
diff --git a/Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.pdf b/Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.pdf
index 6401ed5cf8e..f43e6c22f18 100644
--- a/Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.pdf
+++ b/Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.pdf
diff --git a/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.pdf b/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.pdf
index 83ab40a82ed..01e9e6e09a9 100644
--- a/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.pdf
+++ b/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.pdf
diff --git a/Master/texmf-dist/doc/latex/platex-tools/pxeveryshi.pdf b/Master/texmf-dist/doc/latex/platex-tools/pxeveryshi.pdf
index d4538ba42c8..35418cd9774 100644
--- a/Master/texmf-dist/doc/latex/platex-tools/pxeveryshi.pdf
+++ b/Master/texmf-dist/doc/latex/platex-tools/pxeveryshi.pdf
diff --git a/Master/texmf-dist/doc/latex/platex-tools/pxftnright.pdf b/Master/texmf-dist/doc/latex/platex-tools/pxftnright.pdf
index 918d40a3240..29ee0a12466 100644
--- a/Master/texmf-dist/doc/latex/platex-tools/pxftnright.pdf
+++ b/Master/texmf-dist/doc/latex/platex-tools/pxftnright.pdf
diff --git a/Master/texmf-dist/doc/latex/platex-tools/pxmulticol.pdf b/Master/texmf-dist/doc/latex/platex-tools/pxmulticol.pdf
index a82970574c0..50a904177eb 100644
--- a/Master/texmf-dist/doc/latex/platex-tools/pxmulticol.pdf
+++ b/Master/texmf-dist/doc/latex/platex-tools/pxmulticol.pdf
diff --git a/Master/texmf-dist/doc/latex/platex-tools/pxxspace.pdf b/Master/texmf-dist/doc/latex/platex-tools/pxxspace.pdf
index 8dc7a2a4a8d..fb9645aa465 100644
--- a/Master/texmf-dist/doc/latex/platex-tools/pxxspace.pdf
+++ b/Master/texmf-dist/doc/latex/platex-tools/pxxspace.pdf
diff --git a/Master/texmf-dist/tex/latex/platex-tools/plarray.sty b/Master/texmf-dist/tex/latex/platex-tools/plarray.sty
index 52ff536d540..2629e52bcad 100644
--- a/Master/texmf-dist/tex/latex/platex-tools/plarray.sty
+++ b/Master/texmf-dist/tex/latex/platex-tools/plarray.sty
@@ -7,9 +7,9 @@
 %
 % This package is expected to be compatible with
 %   * array.sty in latex-tools
-%     (2016/10/06 v2.4d -- 2019/08/31 v2.4l)
+%     (2016/10/06 v2.4d -- 2020/10/01 v2.5c)
 %   * plcore.ltx in platex
-%     (2001/09/26 v1.2a -- 2020/03/05 v1.3e)
+%     (2001/09/26 v1.2a -- 2020/09/28 v1.3g)
 %
 
 \NeedsTeXFormat{pLaTeX2e}
diff --git a/Master/texmf-dist/tex/latex/platex-tools/pldocverb.sty b/Master/texmf-dist/tex/latex/platex-tools/pldocverb.sty
new file mode 100644
index 00000000000..c3b7ec70501
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/platex-tools/pldocverb.sty
@@ -0,0 +1,41 @@
+%
+% pldocverb.sty
+% written by Hironobu Yamashita (@aminophen)
+%
+% This package is part of the plautopatch bundle.
+% https://github.com/aminophen/plautopatch
+%
+% This package is expected to be compatible with
+%   * doc.sty
+%     (2004/02/09 v2.1b -- 2020/06/15 v2.1m)
+%   * plcore.ltx in platex
+%     (2001/09/26 v1.2a -- 2020/03/05 v1.3e)
+%
+
+%% package declaration
+\NeedsTeXFormat{pLaTeX2e}
+\ProvidesPackage{pldocverb}
+  [2020/10/08 v0.2a doc package for pLaTeX/upLaTeX]
+\RequirePackage{doc}
+% doc.sty conditionally requires multicol.sty without passing options
+\IfFileExists{pxmulticol.sty}{\RequirePackage{pxmulticol}}{}
+
+%% enable \xkanjiskip insertion,
+%% while preserving beginning space characters (pLaTeX2e 2017/10/28)
+\@ifl@t@r{\pfmtversion}{2017/10/28}{\@firstoftwo}{\@secondoftwo}
+{% = for pLaTeX2e 2017/10/28 or newer
+\def\verb{\relax\ifmmode\hbox\else\leavevmode\vadjust{}\fi
+  \bgroup \let\do\do@noligs \verbatim@nolig@list
+    \ttfamily \verb@eol@error \let\do\@makeother \dospecials
+    \@ifstar{\@sverb}{\@vobeyspaces \frenchspacing \@sverb}}
+}% =
+{% = for pLaTeX2e 2017/09/26 or older
+\def\verb{\relax\ifmmode\hbox\else\leavevmode\fi
+  \bgroup \let\do\do@noligs \verbatim@nolig@list
+    \ttfamily \verb@eol@error \let\do\@makeother \dospecials
+    \@ifstar{\@sverb}{\@vobeyspaces \frenchspacing \@sverb}}
+}% =
+%
+%% done
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty b/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty
index a1f38056782..24c8d2ca997 100644
--- a/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty
+++ b/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty
@@ -7,9 +7,9 @@
 %
 % This package is expected to be compatible with
 %   * array.sty in latex-tools
-%     (2016/10/06 v2.4d -- 2019/08/31 v2.4l)
+%     (2016/10/06 v2.4d -- 2020/10/01 v2.5c)
 %   * plext.sty in platex
-%     (2001/09/26 v1.2  -- 2019/09/29 v1.2l)
+%     (2001/09/26 v1.2  -- 2020/10/07 v1.2m)
 % Largely based on lltjext.sty from LuaTeX-ja project.
 %
 
diff --git a/Master/texmf-dist/tex/latex/platex-tools/plextcolortbl.sty b/Master/texmf-dist/tex/latex/platex-tools/plextcolortbl.sty
new file mode 100644
index 00000000000..a56a3067cf1
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/platex-tools/plextcolortbl.sty
@@ -0,0 +1,39 @@
+%
+% plextcolortbl.sty
+% written by Hironobu Yamashita (@aminophen)
+%
+% This package is part of the plautopatch bundle.
+% https://github.com/aminophen/plautopatch
+%
+% This package is expected to be compatible with
+%   * colortbl.sty
+%     (2012/06/21 v1.0b -- 2020/01/04 v1.0e)
+%   * plext.sty in platex
+%     (2001/09/26 v1.2  -- 2020/10/07 v1.2m)
+%
+
+%% package declaration
+\NeedsTeXFormat{pLaTeX2e}
+\ProvidesPackage{plextcolortbl}
+  [2018/09/19 v0.1a Merge plext and colortbl]
+\RequirePackage{plextarray}% colortbl requires array
+\RequirePackageWithOptions{colortbl}
+
+%% patching internal code for colortbl.sty
+%
+\AtBeginDocument{%
+  % recover \@tabarray from plextarray.sty
+  \def\@tabarray{\@ifnextchar<\p@tabarray{\p@tabarray<Z>}}
+  % change \p@tabarray instead
+  \expandafter\def\expandafter\p@tabarray
+    \expandafter<\expandafter#\expandafter1\expandafter>\expandafter{%
+    \expandafter\CT@start\p@tabarray<#1>}%
+}
+%
+\def\endarray{\crcr \egroup \egroup
+  \@end@alignbox %% added from plext.sty
+  \@arrayright \gdef\@preamble{}\CT@end}%
+%
+%% done
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/platex-tools/plextdelarray.sty b/Master/texmf-dist/tex/latex/platex-tools/plextdelarray.sty
index 03008c193e6..fff8dbb64c1 100644
--- a/Master/texmf-dist/tex/latex/platex-tools/plextdelarray.sty
+++ b/Master/texmf-dist/tex/latex/platex-tools/plextdelarray.sty
@@ -9,7 +9,7 @@
 %   * delarray.sty in latex-tools
 %     (2014/10/28 v1.01)
 %   * plext.sty in platex
-%     (2001/09/26 v1.2  -- 2019/09/29 v1.2l)
+%     (2001/09/26 v1.2  -- 2020/10/07 v1.2m)
 %
 
 \NeedsTeXFormat{pLaTeX2e}