plautopatch (27oct18)

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

3 files changed, 45 insertions, 7 deletions

diff --git a/Master/texmf-dist/tex/latex/plautopatch/plarydshln.sty b/Master/texmf-dist/tex/latex/plautopatch/plarydshln.sty
new file mode 100644
index 00000000000..f020235b5bd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/plautopatch/plarydshln.sty
@@ -0,0 +1,35 @@
+%
+% plarydshln.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
+%   * 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)
+%
+
+%% package declaration
+\NeedsTeXFormat{pLaTeX2e}
+\ProvidesPackage{plarydshln}
+  [2018/10/20 v0.4 arydshln package for pLaTeX/upLaTeX]
+\RequirePackage{arydshln}
+
+%% handle package compatibility issues beforehand
+\@ifpackageloaded{array}{\RequirePackage{plarray}}{}
+
+%% patching internal code for arydshln.sty
+%
+%% remove extra \xkanjiskip (pLaTeX2e 2016/04/17)
+\@ifl@t@r{\pfmtversion}{2016/04/17}{\@firstofone}{\@gobble}
+{% = for pLaTeX2e 2016/04/17 or newer
+\def\endtabular{\endarray $\egroup\null}
+\expandafter\let\csname endtabular*\endcsname\endtabular
+}% =
+%
+%% done
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/plautopatch/plautopatch.sty b/Master/texmf-dist/tex/latex/plautopatch/plautopatch.sty
index 39eb927aae7..900e1cc31e3 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/10/02 v0.6 Automated patches for pLaTeX/upLaTeX]
+    [2018/10/27 v0.8 Automated patches for pLaTeX/upLaTeX]
 
 \ifx\pfmtname\@undefined
   \PackageWarningNoLine{plautopatch}{%
@@ -178,12 +178,15 @@
 \platpc@patch@after@both{array}{plext}{plextarray}% platex-tools
 \platpc@patch@after@both{delarray}{plext}{plextdelarray}% platex-tools
 \platpc@patch@after@both{colortbl}{plext}{plextcolortbl}% (maintained here!)
-\platpc@patch@after{everysel}{pxeverysel}% platex-tools
+\platpc@patch@after{arydshln}{plarydshln}% (maintained here!)
+\platpc@patch@after@both{arydshln}{plext}{plextarydshln}% (maintained here!)
+% --- in most cases, pxeverysel can be safely loaded even after everysel
+% --- but it can fail when \AtBeginDocument{everysel} is involved
+\platpc@patch@before{everysel}{pxeverysel}% platex-tools
 \platpc@patch@after{everyshi}{pxeveryshi}% platex-tools
 \platpc@patch@after{atbegshi}{pxatbegshi}% platex-tools
 \platpc@patch@before{ftnright}{pxftnright}% platex-tools
 \platpc@patch@after{pdfpages}{pxpdfpages}% (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 a699a391bdd..53df6eaa78b 100644
--- a/Master/texmf-dist/tex/latex/plautopatch/plextarydshln.sty
+++ b/Master/texmf-dist/tex/latex/plautopatch/plextarydshln.sty
@@ -8,16 +8,16 @@
 % 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)
+%   * plext.sty in platex
+%     (2001/09/26 v1.2  -- 2018/09/20 v1.2j)
 %
 
 %% package declaration
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesPackage{plextarydshln}
-  [2018/10/02 v0.3 Merge plext and arydshln]
+  [2018/10/20 v0.4 Merge plext and arydshln]
 \RequirePackage{plext}
-\RequirePackage{arydshln}
+\RequirePackage{plarydshln}
 
 %% handle package compatibility issues beforehand
 %  Note: The "arydshln" manual requests users to load