plautopatch (2oct18)

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

2 files changed, 27 insertions, 11 deletions

diff --git a/Master/texmf-dist/tex/latex/plautopatch/plautopatch.sty b/Master/texmf-dist/tex/latex/plautopatch/plautopatch.sty
index 8dbc7eb9383..39eb927aae7 100644
--- a/Master/texmf-dist/tex/latex/plautopatch/plautopatch.sty
+++ b/Master/texmf-dist/tex/latex/plautopatch/plautopatch.sty
@@ -8,7 +8,7 @@
 
 \NeedsTeXFormat{LaTeX2e}% not pLaTeX2e on purpose!
 \ProvidesPackage{plautopatch}
-    [2018/09/21 v0.5 Automated patches for pLaTeX/upLaTeX]
+    [2018/10/02 v0.6 Automated patches for pLaTeX/upLaTeX]
 
 \ifx\pfmtname\@undefined
   \PackageWarningNoLine{plautopatch}{%
@@ -183,8 +183,7 @@
 \platpc@patch@after{atbegshi}{pxatbegshi}% platex-tools
 \platpc@patch@before{ftnright}{pxftnright}% platex-tools
 \platpc@patch@after{pdfpages}{pxpdfpages}% (maintained here!)
-% --- plextarydshln is not well tested, not activated for now
-%\platpc@patch@after@both{arydshln}{plext}{plextarydshln}% (maintained here!)
+\platpc@patch@after@both{arydshln}{plext}{plextarydshln}% (maintained here!)
 
 % for TikZ/PGF
 \platpc@patch@after{pgfrcs}{pxpgfrcs}% (maintained here!)
diff --git a/Master/texmf-dist/tex/latex/plautopatch/plextarydshln.sty b/Master/texmf-dist/tex/latex/plautopatch/plextarydshln.sty
index fc15b056043..a699a391bdd 100644
--- a/Master/texmf-dist/tex/latex/plautopatch/plextarydshln.sty
+++ b/Master/texmf-dist/tex/latex/plautopatch/plextarydshln.sty
@@ -7,7 +7,7 @@
 %
 % This package is expected to be compatible with
 %   * arydshln.sty
-%     (????/??/??)
+%     (2004/08/31 v1.71 -- 2018/09/26 v1.74)
 %   * plcore.ltx in platex
 %     (2001/09/26 v1.2a -- 2018/09/02 v1.3)
 %
@@ -15,7 +15,7 @@
 %% package declaration
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesPackage{plextarydshln}
-  [2018/09/19 v0.1 Merge plext and arydshln]
+  [2018/10/02 v0.3 Merge plext and arydshln]
 \RequirePackage{plext}
 \RequirePackage{arydshln}
 
@@ -27,16 +27,33 @@
 %        So, hoping that users are clever enough to load
 %        them before plextarydshln, load known patches
 %        at this point when they are detected.
-%\@ifpackageloaded{array}{\RequirePackage{plextarray}}{}
-%\@ifpackageloaded{colortbl}{\RequirePackage{plextcolortbl}}{}
+\@ifpackageloaded{array}{\RequirePackage{plextarray}}{}
+\@ifpackageloaded{colortbl}{\RequirePackage{plextcolortbl}}{}
+%  Note: The following package is not necessarily loaded
+%        before arydshln; but handle the incompatibility
+%        if loaded before plextarydshln.
+\@ifpackageloaded{delarray}{\RequirePackage{plextdelarray}}{}
 
 %% patching internal code for arydshln.sty and plext.sty
 %
 \let\adl@p@array\p@array
-\def\p@array{%
-   \adl@everyvbox\everyvbox
-   \everyvbox{\adl@arrayinit \the\adl@everyvbox \everyvbox\adl@everyvbox}%
-   \adl@p@array}
+\def\p@array{\adl@everyvbox\everyvbox
+        \everyvbox{\adl@arrayinit \the\adl@everyvbox \everyvbox\adl@everyvbox}%
+        \ifadl@inactive \adl@inactivate \else \adl@activate \fi
+        \let\adl@noalign\noalign
+        \adl@p@array}
+\def\endarray{\adl@endarray \egroup \adl@arrayrestore \egroup
+   \@end@alignbox \csname @arrayright\endcsname}
+%
+%% done
+
+%% compatibility with colortbl.sty
+%
+\@ifpackageloaded{colortbl}{\@firstofone}{\@gobble}
+{% = colortbl.sty loaded
+\def\endarray{\adl@endarray \egroup \adl@arrayrestore \CT@end \egroup
+   \@end@alignbox \csname @arrayright\endcsname}%
+}% =
 %
 %% done