summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/platex-tools
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-09-18 21:32:15 +0000
committerKarl Berry <karl@freefriends.org>2018-09-18 21:32:15 +0000
commit3a714d124787d5ac238a028165c7d899f91d9e5f (patch)
tree7aa7c5ef5db535ad39b233de48848926e4705cba /Master/texmf-dist/tex/latex/platex-tools
parent2386bc36ed759ad67cc4c8bfb14ffe50c6db0ce2 (diff)
platex-tools (18sep18)
git-svn-id: svn://tug.org/texlive/trunk@48693 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/platex-tools')
-rw-r--r--Master/texmf-dist/tex/latex/platex-tools/plarray.sty30
-rw-r--r--Master/texmf-dist/tex/latex/platex-tools/plextarray.sty40
-rw-r--r--Master/texmf-dist/tex/latex/platex-tools/plextdelarray.sty15
3 files changed, 60 insertions, 25 deletions
diff --git a/Master/texmf-dist/tex/latex/platex-tools/plarray.sty b/Master/texmf-dist/tex/latex/platex-tools/plarray.sty
index 37cb9f3c97a..62221391eb3 100644
--- a/Master/texmf-dist/tex/latex/platex-tools/plarray.sty
+++ b/Master/texmf-dist/tex/latex/platex-tools/plarray.sty
@@ -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@t@r{\pfmtversion}{2016/04/17}
+ {\expandafter\@firstoftwo}
+ {\expandafter\@secondoftwo}
+{% = for pLaTeX2e 2016/04/17 or newer
\def\@tabular{%
\leavevmode \null
\hbox \bgroup $\col@sep\tabcolsep \let\d@llarbegin\begingroup
@@ -25,18 +31,26 @@
\@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@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@column{%
\the@toks \the \@tempcnta
\mbox{}\inhibitglue \ignorespaces \@sharp \unskip \unskip
\the@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@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@column{%
\the@toks \the \@tempcnta
\relax \pltx@next@inhibitglue
@@ -44,6 +58,10 @@
\the@toks \the \count@ \relax}
\fi
\fi
+}% =
+{% = for pLaTeX2e 2017/05/05 or older
+% nothing to be done
+}% =
%
%% done
diff --git a/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty b/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty
index 579c29cbacf..cc837edc6c5 100644
--- a/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty
+++ b/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty
@@ -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@begingroup
\box@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@dir\adjustbaseline %% added
+ \setlength\hsize{#1}\@arrayparboxrestore
+ \everypar{%
+ \vrule \@height \ht\@arstrutbox \@width \z@
+ \everypar{}}%
+ }%
+}% =
%
\def\@tabarray{\@ifnextchar<\p@tabarray{\p@tabarray<Z>}}
%
@@ -65,8 +82,8 @@
\fi
%%%%% new code end
\setbox \@arstrutbox \hbox{\box@dir %% add \box@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@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@alignbox \@arrayright \gdef\@preamble{}\CT@end}%
-}{}
-%% all 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 b81a88b3323..57682c7fd83 100644
--- a/Master/texmf-dist/tex/latex/platex-tools/plextdelarray.sty
+++ b/Master/texmf-dist/tex/latex/platex-tools/plextdelarray.sty
@@ -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@del@array<#1>[#2]}}
%
%% adopt from \@del@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@alignbox in \fork@array@option.
\def\p@del@array<#1>[#2]#3#4#5{%
\setbox\z@\hbox{$\left#3\right#5$}%
\if#2c\def\@arrayleft{\left#3}\def\@arrayright{\right#5}%