diff options
author | Karl Berry <karl@freefriends.org> | 2018-10-27 21:38:45 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-10-27 21:38:45 +0000 |
commit | 643b48880dc8faeb5bafb7dd0dbea196a0991412 (patch) | |
tree | 2a896a0cb20cefa8d22372e12d39586e7a741cc8 | |
parent | 57d9620a275079e25e21b8b157f4749279511d20 (diff) |
plautopatch (27oct18)
git-svn-id: svn://tug.org/texlive/trunk@49003 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/plautopatch/README.md | 7 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.pdf | bin | 99552 -> 99780 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex | 21 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/plautopatch/plautopatch.pdf | bin | 33336 -> 33540 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/plautopatch/plautopatch.tex | 21 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/plautopatch/plarydshln.sty | 35 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/plautopatch/plautopatch.sty | 9 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/plautopatch/plextarydshln.sty | 8 |
8 files changed, 77 insertions, 24 deletions
diff --git a/Master/texmf-dist/doc/latex/plautopatch/README.md b/Master/texmf-dist/doc/latex/plautopatch/README.md index 8b1a3bb9423..8fada8f2c7f 100644 --- a/Master/texmf-dist/doc/latex/plautopatch/README.md +++ b/Master/texmf-dist/doc/latex/plautopatch/README.md @@ -21,6 +21,7 @@ The following patches are currently registered: - array (latex-tools) + plext (platex) -> plextarray (platex-tools) - delarray (latex-tools) + plext (platex) -> plextdelarray (platex-tools) - colortbl + plext (platex) -> plextcolortbl (maintained here!) +- arydshln -> plarydshln (maintained here!) - arydshln + plext (platex) -> plextarydshln (maintained here!) - everysel (ms) -> pxeverysel (platex-tools) - everyshi (ms) -> pxeveryshi (platex-tools) @@ -44,6 +45,10 @@ together with the main package. Short information: Patch for colortbl.sty (by David Carlisle) to improve compatibility with plext.sty in pLaTeX. Can be used on pLaTeX/upLaTeX. +- plarydshln.sty: + Patch for arydshln.sty (by Hiroshi Nakashima) to improve + compatibility with pLaTeX/upLaTeX kernels. + Can be used on pLaTeX/upLaTeX. - plextarydshln.sty: Patch for arydshln.sty (by Hiroshi Nakashima) to improve compatibility with plext.sty in pLaTeX. @@ -74,6 +79,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2018-10-02 +2018-10-27 Hironobu Yamashita diff --git a/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.pdf b/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.pdf Binary files differindex 195f56d1889..53f27aa2e7a 100644 --- a/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.pdf +++ b/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.pdf diff --git a/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex b/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex index 8dfff9a854e..8bc2d49e91c 100644 --- a/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex +++ b/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex @@ -76,18 +76,21 @@ p\LaTeX/up\LaTeX{}で動作するソースと通常の\LaTeX{}ソースの \def\ITEMoTo#1 (#2) -> #3 (#4){% \item \textsf{#1} (\textsf{#2})\\ $\rightarrow$ \textsf{#3} (\textsf{#4})} +\def\ITEMoTx#1 (#2) -> #3 {% + \item \textsf{#1} (\textsf{#2})\\ + $\rightarrow$ \textsf{#3} } +\def\ITEMxTx#1 -> #2 {% + \item \textsf{#1}\\ + $\rightarrow$ \textsf{#2} } \def\ITEMooTo#1 (#2) + #3 (#4) -> #5 (#6){% \item \textsf{#1} (\textsf{#2}) + \textsf{#3} (\textsf{#4})\\ $\rightarrow$ \textsf{#5} (\textsf{#6})} \def\ITEMxoTo#1 + #2 (#3) -> #4 (#5){% \item \textsf{#1} + \textsf{#2} (\textsf{#3})\\ $\rightarrow$ \textsf{#4} (\textsf{#5})} -\def\ITEMoTx#1 (#2) -> #3 {% - \item \textsf{#1} (\textsf{#2})\\ - $\rightarrow$ \textsf{#3} } -\def\ITEMxTx#1 -> #2 {% - \item \textsf{#1}\\ - $\rightarrow$ \textsf{#2} } +\def\ITEMxoTx#1 + #2 (#3) -> #4 {% + \item \textsf{#1} + \textsf{#2} (\textsf{#3})\\ + $\rightarrow$ \textsf{#4} } 凡例: \begin{itemize} @@ -103,8 +106,9 @@ p\LaTeX/up\LaTeX{}で動作するソースと通常の\LaTeX{}ソースの \ITEMoTo array (latex-tools) -> plarray (platex-tools) \ITEMooTo array (latex-tools) + plext (platex) -> plextarray (platex-tools) \ITEMooTo delarray (latex-tools) + plext (platex) -> plextdelarray (platex-tools) -\ITEMxoTo colortbl + plext (platex) -> plextcolortbl (maintained here!) -\ITEMxoTo arydshln + plext (platex) -> plextarydshln (maintained here!) +\ITEMxoTx colortbl + plext (platex) -> plextcolortbl (maintained here!) +\ITEMxTx arydshln -> plarydshln (maintained here!) +\ITEMxoTx arydshln + plext (platex) -> plextarydshln (maintained here!) \ITEMoTo everysel (ms) -> pxeverysel (platex-tools) \ITEMoTo everyshi (ms) -> pxeveryshi (platex-tools) \ITEMoTo atbegshi (oberdiek) -> pxatbegshi (platex-tools) @@ -138,6 +142,7 @@ p\LaTeX/up\LaTeX{}で動作するソースと通常の\LaTeX{}ソースの \item 2018/08/22 v0.3 元パッケージ検出の改良 \item 2018/09/21 v0.5 \textsf{colortbl}や\textsf{pgf}もサポート \item 2018/10/02 v0.6 \textsf{arydshln}のサポート + \item 2018/10/27 v0.8 \textsf{everysel}サポートの改良 \end{itemize} \end{document} diff --git a/Master/texmf-dist/doc/latex/plautopatch/plautopatch.pdf b/Master/texmf-dist/doc/latex/plautopatch/plautopatch.pdf Binary files differindex ca69882097e..82db6fdc71b 100644 --- a/Master/texmf-dist/doc/latex/plautopatch/plautopatch.pdf +++ b/Master/texmf-dist/doc/latex/plautopatch/plautopatch.pdf diff --git a/Master/texmf-dist/doc/latex/plautopatch/plautopatch.tex b/Master/texmf-dist/doc/latex/plautopatch/plautopatch.tex index b49ed41cce4..6ff12123067 100644 --- a/Master/texmf-dist/doc/latex/plautopatch/plautopatch.tex +++ b/Master/texmf-dist/doc/latex/plautopatch/plautopatch.tex @@ -76,18 +76,21 @@ as a list separated by commas and spaces. \def\ITEMoTo#1 (#2) -> #3 (#4){% \item \textsf{#1} (\textsf{#2})\\ $\rightarrow$ \textsf{#3} (\textsf{#4})} +\def\ITEMoTx#1 (#2) -> #3 {% + \item \textsf{#1} (\textsf{#2})\\ + $\rightarrow$ \textsf{#3} } +\def\ITEMxTx#1 -> #2 {% + \item \textsf{#1}\\ + $\rightarrow$ \textsf{#2} } \def\ITEMooTo#1 (#2) + #3 (#4) -> #5 (#6){% \item \textsf{#1} (\textsf{#2}) + \textsf{#3} (\textsf{#4})\\ $\rightarrow$ \textsf{#5} (\textsf{#6})} \def\ITEMxoTo#1 + #2 (#3) -> #4 (#5){% \item \textsf{#1} + \textsf{#2} (\textsf{#3})\\ $\rightarrow$ \textsf{#4} (\textsf{#5})} -\def\ITEMoTx#1 (#2) -> #3 {% - \item \textsf{#1} (\textsf{#2})\\ - $\rightarrow$ \textsf{#3} } -\def\ITEMxTx#1 -> #2 {% - \item \textsf{#1}\\ - $\rightarrow$ \textsf{#2} } +\def\ITEMxoTx#1 + #2 (#3) -> #4 {% + \item \textsf{#1} + \textsf{#2} (\textsf{#3})\\ + $\rightarrow$ \textsf{#4} } The legend: \begin{itemize} @@ -102,8 +105,9 @@ Current version (\filedate\space\fileversion) supports the followings: \ITEMoTo array (latex-tools) -> plarray (platex-tools) \ITEMooTo array (latex-tools) + plext (platex) -> plextarray (platex-tools) \ITEMooTo delarray (latex-tools) + plext (platex) -> plextdelarray (platex-tools) -\ITEMxoTo colortbl + plext (platex) -> plextcolortbl (maintained here!) -\ITEMxoTo arydshln + plext (platex) -> plextarydshln (maintained here!) +\ITEMxoTx colortbl + plext (platex) -> plextcolortbl (maintained here!) +\ITEMxTx arydshln -> plarydshln (maintained here!) +\ITEMxoTx arydshln + plext (platex) -> plextarydshln (maintained here!) \ITEMoTo everysel (ms) -> pxeverysel (platex-tools) \ITEMoTo everyshi (ms) -> pxeveryshi (platex-tools) \ITEMoTo atbegshi (oberdiek) -> pxatbegshi (platex-tools) @@ -140,6 +144,7 @@ a comma-separated list of them: \item 2018/08/22 v0.3 Improve detection of problematic packages \item 2018/09/21 v0.5 Add support for \textsf{colortbl} and \textsf{pgf} \item 2018/10/02 v0.6 Add support for \textsf{arydshln} + \item 2018/10/27 v0.8 Better support for \textsf{everysel} \end{itemize} \end{document} 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 |