texlive[48693] Master/texmf-dist: platex-tools (18sep18)
commits+karl at tug.org
commits+karl at tug.org
Tue Sep 18 23:32:15 CEST 2018
Revision: 48693
http://tug.org/svn/texlive?view=revision&revision=48693
Author: karl
Date: 2018-09-18 23:32:15 +0200 (Tue, 18 Sep 2018)
Log Message:
-----------
platex-tools (18sep18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/platex-tools/README.md
trunk/Master/texmf-dist/doc/latex/platex-tools/plarray.pdf
trunk/Master/texmf-dist/doc/latex/platex-tools/plextarray.pdf
trunk/Master/texmf-dist/doc/latex/platex-tools/plextarray.tex
trunk/Master/texmf-dist/doc/latex/platex-tools/plextdelarray.pdf
trunk/Master/texmf-dist/tex/latex/platex-tools/plarray.sty
trunk/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty
trunk/Master/texmf-dist/tex/latex/platex-tools/plextdelarray.sty
Modified: trunk/Master/texmf-dist/doc/latex/platex-tools/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/platex-tools/README.md 2018-09-18 21:31:07 UTC (rev 48692)
+++ trunk/Master/texmf-dist/doc/latex/platex-tools/README.md 2018-09-18 21:32:15 UTC (rev 48693)
@@ -74,6 +74,6 @@
## Release Date
-2018-03-16
+2018-09-18
Hironobu Yamashita
Modified: trunk/Master/texmf-dist/doc/latex/platex-tools/plarray.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/platex-tools/plextarray.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/platex-tools/plextarray.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/platex-tools/plextarray.tex 2018-09-18 21:31:07 UTC (rev 48692)
+++ trunk/Master/texmf-dist/doc/latex/platex-tools/plextarray.tex 2018-09-18 21:32:15 UTC (rev 48693)
@@ -71,13 +71,13 @@
\textsf{plext}と\textsf{array}を共存させたいときに、プリアンブルに
\verb+\usepackage{plextarray}+と書きます。既にいずれかのパッケージが
読み込まれていても問題ありません。また、\textsf{plextarray}パッケージを
-読み込めば、\textsf{plext}と\textsf{array}も自動的に読み込まれます。
+読み込めば、\textsf{plext}と\textsf{array}\footnote{より正確には、
+\textsf{array}と(u)p\LaTeX の衝突を解消する\textsf{plarray}を読み込む
+ことで、間接的に\textsf{array}も読み込まれます。}も自動的に読み込まれます。
\textsf{dcolumn}や\textsf{tabularx}のような、内部で\textsf{array}を利用
しているパッケージを\textsf{plext}と共存させたい場合にも、
-\textsf{plextarray}が便利です。こうしたパッケージと\textsf{plextarray}を
-併用する際には、なるべく後から\textsf{plextarray}を読み込むほうがよい
-でしょう（例：\textsf{colortbl}など）。
+\textsf{plextarray}が便利です。
以下に例を示します。横組中で縦組の表を書く例。
Modified: trunk/Master/texmf-dist/doc/latex/platex-tools/plextdelarray.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/platex-tools/plarray.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/platex-tools/plarray.sty 2018-09-18 21:31:07 UTC (rev 48692)
+++ trunk/Master/texmf-dist/tex/latex/platex-tools/plarray.sty 2018-09-18 21:32:15 UTC (rev 48693)
@@ -5,19 +5,25 @@
% This package is part of the platex-tools bundle.
% https://github.com/aminophen/platex-tools
%
-% This package `plarray.sty' is based on:
-% * array.sty in latex-tools (2016/10/06 v2.4d)
-% * plcore.ltx in platex (2018/03/12 v1.2y)
+% This package is expected to be compatible with
+% * array.sty in latex-tools
+% (2016/10/06 v2.4d -- 2018/09/13 v2.4i)
+% * plcore.ltx in platex
+% (2001/09/26 v1.2a -- 2018/09/02 v1.3)
%
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{plarray}
- [2018/03/12 v0.1e Tabular extension package for pLaTeX/upLaTeX]
+ [2018/09/18 v0.1f Tabular extension package for pLaTeX/upLaTeX]
\RequirePackage{array}
%% patching internal code for array.sty
%
%% remove extra \xkanjiskip (pLaTeX2e 2016/04/17)
+\@ifl at t@r{\pfmtversion}{2016/04/17}
+ {\expandafter\@firstoftwo}
+ {\expandafter\@secondoftwo}
+{% = for pLaTeX2e 2016/04/17 or newer
\def\@tabular{%
\leavevmode \null
\hbox \bgroup $\col at sep\tabcolsep \let\d at llarbegin\begingroup
@@ -25,8 +31,16 @@
\@tabarray}
\def\endtabular{\endarray $\egroup\null}
\expandafter \let \csname endtabular*\endcsname = \endtabular
+}% =
+{% = for pLaTeX2e 2006/11/10 or older
+% nothing to be done
+}% =
%
%% inhibit JFM glue around tabular cell components (pLaTeX2e 2018/03/09)
+\@ifl at t@r{\pfmtversion}{2017/07/29}
+ {\expandafter\@firstoftwo}
+ {\expandafter\@secondoftwo}
+{% = for pLaTeX2e 2017/07/29 or newer
% first, provide old definition; there are some known incompatibility
% compared to LaTeX, pLaTeX or array
\def\insert at column{%
@@ -33,10 +47,10 @@
\the at toks \the \@tempcnta
\mbox{}\inhibitglue \ignorespaces \@sharp \unskip \unskip
\the at toks \the \count@ \relax}
+% if both macros are available, override with new definition
+% (= pLaTeX2e 2018/03/09 or later, built on e-(u)pTeX 180226)
\ifx\pltx at next@inhibitglue\@undefined\else
\ifx\removejfmglue\@undefined\else
- % both macros are available, override with new definition
- % (= pLaTeX2e 2018/03/09 or later, built on e-(u)pTeX 180226)
\def\insert at column{%
\the at toks \the \@tempcnta
\relax \pltx at next@inhibitglue
@@ -44,6 +58,10 @@
\the at toks \the \count@ \relax}
\fi
\fi
+}% =
+{% = for pLaTeX2e 2017/05/05 or older
+% nothing to be done
+}% =
%
%% done
Modified: trunk/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty 2018-09-18 21:31:07 UTC (rev 48692)
+++ trunk/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty 2018-09-18 21:32:15 UTC (rev 48693)
@@ -5,15 +5,17 @@
% This package is part of the platex-tools bundle.
% https://github.com/aminophen/platex-tools
%
-% This package `plextarray.sty' is based on:
-% * array.sty in latex-tools (2016/10/06 v2.4d)
-% * plext.sty in platex (2017/07/21 v1.2h)
-% and lltjext.sty from LuaTeX-ja project.
+% This package is expected to be compatible with
+% * array.sty in latex-tools
+% (2016/10/06 v2.4d -- 2018/09/13 v2.4i)
+% * plext.sty in platex
+% (2001/09/26 v1.2 -- 2018/09/09 v1.2i)
+% Largely based on lltjext.sty from LuaTeX-ja project.
%
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{plextarray}
- [2017/07/29 v1.0j Tabular extension package for plext and array]
+ [2018/09/18 v1.1b Tabular extension package for plext and array]
\RequirePackage{plext}
\RequirePackage{plarray}
@@ -28,13 +30,28 @@
%% patching internal code for array.sty and plext.sty
%
+\@ifpackagelater{array}{2018/09/13}
+ {\expandafter\@firstoftwo}
+ {\expandafter\@secondoftwo}
+{% = for 2018/09/13 v2.4i or newer
\def\@startpbox#1{\bgroup
+ \color at begingroup
\box at dir\adjustbaseline %% added
\setlength\hsize{#1}\@arrayparboxrestore
\everypar{%
\vrule \@height \ht\@arstrutbox \@width \z@
\everypar{}}%
- }
+ }%
+}% =
+{% = for 2018/04/30 v2.4h or older
+\def\@startpbox#1{\bgroup
+ \box at dir\adjustbaseline %% added
+ \setlength\hsize{#1}\@arrayparboxrestore
+ \everypar{%
+ \vrule \@height \ht\@arstrutbox \@width \z@
+ \everypar{}}%
+ }%
+}% =
%
\def\@tabarray{\@ifnextchar<\p at tabarray{\p at tabarray<Z>}}
%
@@ -65,8 +82,8 @@
\fi
%%%%% new code end
\setbox \@arstrutbox \hbox{\box at dir %% add \box at dir
- % the behavior of \strutbox may be changed
- % (box resister -> conditional macro) in the future;
+ % the behavior of \strutbox has been changed
+ % (box resister -> conditional macro) in pLaTeX2e 2017/04/08;
% so, \strutbox should appear after \box at dir is applied.
\@tempcntb=\ifcase\@tempcnta\strutbox
\or\tstrutbox\or\zstrutbox\or\@ctrerr\fi
@@ -97,11 +114,4 @@
%
%% done
-%% support for other packages
-\@ifpackageloaded{colortbl}{% --- colortbl.sty 2012/06/21 v1.0b
- \PackageInfo{plextarray}{Package colortbl detected}%
- \def\endarray{\crcr \egroup \egroup \@end at alignbox \@arrayright \gdef\@preamble{}\CT at end}%
-}{}
-%% all done
-
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/platex-tools/plextdelarray.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/platex-tools/plextdelarray.sty 2018-09-18 21:31:07 UTC (rev 48692)
+++ trunk/Master/texmf-dist/tex/latex/platex-tools/plextdelarray.sty 2018-09-18 21:32:15 UTC (rev 48693)
@@ -5,14 +5,16 @@
% This package is part of the platex-tools bundle.
% https://github.com/aminophen/platex-tools
%
-% This package `plextdelarray.sty' is based on:
-% * delarray.sty in latex-tools (2014/10/28 v1.01)
-% * plext.sty in platex (2016/08/20 v1.2a)
+% This package is expected to be compatible with
+% * delarray.sty in latex-tools
+% (2014/10/28 v1.01)
+% * plext.sty in platex
+% (2001/09/26 v1.2 -- 2018/09/09 v1.2i)
%
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{plextdelarray}
- [2016/09/11 v1.0 array delimiter package for plext and delarray]
+ [2018/09/18 v1.0a array delimiter package for plext and delarray]
\RequirePackage{plextarray}
\RequirePackage{delarray}
@@ -30,6 +32,11 @@
{\p at del@array<#1>[#2]}}
%
%% adopt from \@del at array (from delarray.sty)
+% Note: we can't use \unvbox\z@, because there is a possibility
+% that \@arrayleft is followed by \raise etc, instead of
+% a box-starting command (\vtop, \vbox etc).
+% Otherwise, an error "! A <box> was supposed to be here."
+% See definitions of \@begin at alignbox in \fork at array@option.
\def\p at del@array<#1>[#2]#3#4#5{%
\setbox\z@\hbox{$\left#3\right#5$}%
\if#2c\def\@arrayleft{\left#3}\def\@arrayright{\right#5}%
More information about the tex-live-commits
mailing list