From 3ad14089b66002cf844e78021bd2eddf53ce7cf1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 30 Nov 2018 23:18:04 +0000 Subject: plautopatch git-svn-id: svn://tug.org/texlive/trunk@49288 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/plautopatch/README.md | 18 ++++--- .../doc/latex/plautopatch/plautopatch-ja.pdf | Bin 99894 -> 100238 bytes .../doc/latex/plautopatch/plautopatch-ja.tex | 5 +- .../doc/latex/plautopatch/plautopatch.pdf | Bin 33628 -> 33973 bytes .../doc/latex/plautopatch/plautopatch.tex | 3 ++ .../tex/latex/plautopatch/plautopatch.sty | 9 +++- .../texmf-dist/tex/latex/plautopatch/pldocverb.sty | 41 ++++++++++++++++ .../texmf-dist/tex/latex/plautopatch/plsiunitx.sty | 54 ++++++--------------- 8 files changed, 83 insertions(+), 47 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/plautopatch/pldocverb.sty (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/plautopatch/README.md b/Master/texmf-dist/doc/latex/plautopatch/README.md index c476cc0ffc7..af23bdad44c 100644 --- a/Master/texmf-dist/doc/latex/plautopatch/README.md +++ b/Master/texmf-dist/doc/latex/plautopatch/README.md @@ -15,6 +15,7 @@ similar to those of ordinary LaTeX ones. The following patches are currently registered: +- doc (latex) -> pldocverb (maintained here!) - tracefnt (latex) -> ptrace/uptrace (platex/uplatex) - fltrace (latex) -> pfltrace (platex) - array (latex-tools) -> plarray (platex-tools) @@ -28,6 +29,7 @@ The following patches are currently registered: - everyshi (ms) -> pxeveryshi (platex-tools) - atbegshi (oberdiek) -> pxatbegshi (platex-tools) - ftnright (latex-tools) -> pxftnright (platex-tools) +- multicol (latex-tools) -> pxmulticol (platex-tools) - pdfpages -> pxpdfpages (maintained here!) - pgfrcs (pgf) -> pxpgfrcs (maintained here!) - pgfcore (pgf) -> pxpgfmark (by Takayuki YATO) @@ -42,24 +44,28 @@ written by Martin Scharrer. This bundle may distribute some tiny patches together with the main package. Short information: +- pldocverb.sty: + Patch for doc.sty (latex) to improve + compatibility with `\verb` redefinition in pLaTeX. + Can be used on pLaTeX/upLaTeX. - plextcolortbl.sty: - Patch for colortbl.sty (by David Carlisle­) to improve + 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 + 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 + Patch for arydshln.sty (by Hiroshi Nakashima) to improve compatibility with plext.sty in pLaTeX. Can be used on pLaTeX/upLaTeX. - plsiunitx.sty: - Patch for siunitx.sty (by Joseph Wright­) to fix + Patch for siunitx.sty (by Joseph Wright) to fix conflict with plarray.sty (platex-tools). Can be used on pLaTeX/upLaTeX. - pxpdfpages.sty: - Patch for pdfpages.sty (by An­dreas Matthias) to support + Patch for pdfpages.sty (by Andreas Matthias) to support Japanese-style crop marks (called 'tombow' in Japanese). Can be used on pLaTeX/upLaTeX. - pxpgfrcs.sty: @@ -84,6 +90,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2018-11-03 +2018-11-25 Hironobu Yamashita diff --git a/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.pdf b/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.pdf index 4dfe8d0dde5..bf504cdc80f 100644 Binary files a/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.pdf and b/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.pdf differ diff --git a/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex b/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex index cfffad8c6c8..74c71ada9b5 100644 --- a/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex +++ b/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex @@ -101,6 +101,7 @@ p\LaTeX/up\LaTeX{}で動作するソースと通常の\LaTeX{}ソースの 現在のバージョン (\filedate\space\fileversion) がサポートしているのは 下記のパッケージです。 \begin{itemize} +\ITEMoTo doc (latex) -> pldocverb (maintained here!) \ITEMoTo tracefnt (latex) -> ptrace/uptrace (platex/uplatex) \ITEMoTo fltrace (latex) -> pfltrace (platex) \ITEMoTo array (latex-tools) -> plarray (platex-tools) @@ -114,6 +115,7 @@ p\LaTeX/up\LaTeX{}で動作するソースと通常の\LaTeX{}ソースの \ITEMoTo everyshi (ms) -> pxeveryshi (platex-tools) \ITEMoTo atbegshi (oberdiek) -> pxatbegshi (platex-tools) \ITEMoTo ftnright (latex-tools) -> pxftnright (platex-tools) +\ITEMoTo multicol (latex-tools) -> pxmulticol (platex-tools) \ITEMxTx pdfpages -> pxpdfpages (maintained here!) \ITEMoTx pgfrcs (pgf) -> pxpgfrcs (maintained here!) \ITEMoTx pgfcore (pgf) -> pxpgfmark (by Takayuki YATO) @@ -141,10 +143,11 @@ p\LaTeX/up\LaTeX{}で動作するソースと通常の\LaTeX{}ソースの \begin{itemize} \item 2018/08/21 v0.2 最初のCTANリリース版 \item 2018/08/22 v0.3 元パッケージ検出の改良 - \item 2018/09/21 v0.5 \textsf{colortbl}や\textsf{pgf}もサポート + \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}サポートの改良 \item 2018/11/03 v0.9 \textsf{siunitx}のサポート + \item 2018/11/25 v0.9b \textsf{multicol}と\textsf{doc}のサポート \end{itemize} \end{document} diff --git a/Master/texmf-dist/doc/latex/plautopatch/plautopatch.pdf b/Master/texmf-dist/doc/latex/plautopatch/plautopatch.pdf index ddffaa6db08..837c0a218c9 100644 Binary files a/Master/texmf-dist/doc/latex/plautopatch/plautopatch.pdf and b/Master/texmf-dist/doc/latex/plautopatch/plautopatch.pdf differ diff --git a/Master/texmf-dist/doc/latex/plautopatch/plautopatch.tex b/Master/texmf-dist/doc/latex/plautopatch/plautopatch.tex index 16ba3b51a80..f5a848f74d3 100644 --- a/Master/texmf-dist/doc/latex/plautopatch/plautopatch.tex +++ b/Master/texmf-dist/doc/latex/plautopatch/plautopatch.tex @@ -100,6 +100,7 @@ The legend: Current version (\filedate\space\fileversion) supports the followings: \begin{itemize} +\ITEMoTo doc (latex) -> pldocverb (maintained here!) \ITEMoTo tracefnt (latex) -> ptrace/uptrace (platex/uplatex) \ITEMoTo fltrace (latex) -> pfltrace (platex) \ITEMoTo array (latex-tools) -> plarray (platex-tools) @@ -113,6 +114,7 @@ Current version (\filedate\space\fileversion) supports the followings: \ITEMoTo everyshi (ms) -> pxeveryshi (platex-tools) \ITEMoTo atbegshi (oberdiek) -> pxatbegshi (platex-tools) \ITEMoTo ftnright (latex-tools) -> pxftnright (platex-tools) +\ITEMoTo multicol (latex-tools) -> pxmulticol (platex-tools) \ITEMxTx pdfpages -> pxpdfpages (maintained here!) \ITEMoTx pgfrcs (pgf) -> pxpgfrcs (maintained here!) \ITEMoTx pgfcore (pgf) -> pxpgfmark (by Takayuki YATO) @@ -147,6 +149,7 @@ a comma-separated list of them: \item 2018/10/02 v0.6 Add support for \textsf{arydshln} \item 2018/10/27 v0.8 Better support for \textsf{everysel} \item 2018/11/03 v0.9 Add support for \textsf{siunitx} + \item 2018/11/25 v0.9b Add support for \textsf{multicol} and \textsf{doc} \end{itemize} \end{document} diff --git a/Master/texmf-dist/tex/latex/plautopatch/plautopatch.sty b/Master/texmf-dist/tex/latex/plautopatch/plautopatch.sty index 6c707573501..da5747b34e3 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/11/03 v0.9 Automated patches for pLaTeX/upLaTeX] + [2018/11/25 v0.9b Automated patches for pLaTeX/upLaTeX] \ifx\pfmtname\@undefined \PackageWarningNoLine{plautopatch}{% @@ -168,6 +168,7 @@ % register patches +\platpc@patch@after{doc}{pldocverb}% (maintained here!) \ifx\enablecjktoken\@undefined \platpc@patch@after{tracefnt}{ptrace}% platex \else @@ -187,6 +188,7 @@ \platpc@patch@after{everyshi}{pxeveryshi}% platex-tools \platpc@patch@after{atbegshi}{pxatbegshi}% platex-tools \platpc@patch@before{ftnright}{pxftnright}% platex-tools +\platpc@patch@after{multicol}{pxmulticol}% platex-tools \platpc@patch@after{pdfpages}{pxpdfpages}% (maintained here!) % for TikZ/PGF @@ -195,4 +197,9 @@ % --- but does no harm for other conditions \platpc@patch@after{pgfcore}{pxpgfmark}% by Takayuki YATO (ZR) +% special case, mainly for problematic packages +% --- mdwtab forbids loading array +% --- so plarray should also be forbidden +\AtEndOfPackageFile{mdwtab}{\@namedef{ver@plarray.sty}{}} + \endinput diff --git a/Master/texmf-dist/tex/latex/plautopatch/pldocverb.sty b/Master/texmf-dist/tex/latex/plautopatch/pldocverb.sty new file mode 100644 index 00000000000..cf54a623536 --- /dev/null +++ b/Master/texmf-dist/tex/latex/plautopatch/pldocverb.sty @@ -0,0 +1,41 @@ +% +% pldocverb.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 +% * doc.sty +% (2004/02/09 v2.1b -- 2018/09/25 v2.1i) +% * plcore.ltx in platex +% (2001/09/26 v1.2a -- 2018/09/02 v1.3) +% + +%% package declaration +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{pldocverb} + [2018/11/25 v0.2 doc package for pLaTeX/upLaTeX] +\RequirePackage{doc} +% doc.sty conditionally requires multicol.sty without passing options +\IfFileExists{pxmulticol.sty}{\RequirePackage{pxmulticol}}{} + +%% enable \xkanjiskip insertion, +%% while preserving beginning space characters (pLaTeX2e 2017/10/28) +\@ifl@t@r{\pfmtversion}{2017/10/28}{\@firstoftwo}{\@secondoftwo} +{% = for pLaTeX2e 2017/10/28 or newer +\def\verb{\relax\ifmmode\hbox\else\leavevmode\vadjust{}\fi + \bgroup \let\do\do@noligs \verbatim@nolig@list + \ttfamily \verb@eol@error \let\do\@makeother \dospecials + \@ifstar{\@sverb}{\@vobeyspaces \frenchspacing \@sverb}} +}% = +{% = for pLaTeX2e 2017/09/26 or older +\def\verb{\relax\ifmmode\hbox\else\leavevmode\fi + \bgroup \let\do\do@noligs \verbatim@nolig@list + \ttfamily \verb@eol@error \let\do\@makeother \dospecials + \@ifstar{\@sverb}{\@vobeyspaces \frenchspacing \@sverb}} +}% = +% +%% done + +\endinput diff --git a/Master/texmf-dist/tex/latex/plautopatch/plsiunitx.sty b/Master/texmf-dist/tex/latex/plautopatch/plsiunitx.sty index c76efed7bca..1f9a4c00dd1 100644 --- a/Master/texmf-dist/tex/latex/plautopatch/plsiunitx.sty +++ b/Master/texmf-dist/tex/latex/plautopatch/plsiunitx.sty @@ -16,7 +16,7 @@ %% package declaration \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{plsiunitx} - [2018/11/03 v0.1 siunitx package for pLaTeX/upLaTeX] + [2018/11/04 v0.2 siunitx package for pLaTeX/upLaTeX] \RequirePackageWithOptions{siunitx} \RequirePackage{plarray}% siunitx requires array @@ -28,44 +28,20 @@ \@ifl@t@r{\pfmtversion}{2017/07/29}{\@firstofone}{\@gobble} {% = for pLaTeX2e 2017/07/29 or newer %% new table column: S and s -\cs_set_protected:Npn \__siunitx_table_collect_not_braced:N #1 - { - \token_if_eq_meaning:NNF #1 \relax { - \token_if_eq_meaning:NNF #1 \pltx@next@inhibitglue { - \token_if_eq_meaning:NNF #1 \removejfmglue { - \token_if_eq_meaning:NNF #1 \tex_ignorespaces:D - { - \token_if_eq_meaning:NNF #1 \tex_unskip:D - { \__siunitx_table_collect_not_braced_aux_i:N #1 } - } - }}} - \__siunitx_table_collect_next: - } -\AtBeginDocument - { - \@ifpackageloaded { mdwtab } - { - \cs_set_protected:Npn \__siunitx_table_collect_not_braced:N #1 - { - \token_if_eq_meaning:NNF #1 \relax { - \token_if_eq_meaning:NNF #1 \pltx@next@inhibitglue { - \token_if_eq_meaning:NNF #1 \removejfmglue { - \token_if_eq_meaning:NNF #1 \tex_ignorespaces:D - { - \token_if_eq_meaning:NNF #1 \tex_unskip:D - { - \token_if_eq_meaning:NNF #1 \tab@setcr - { - \token_if_eq_meaning:NNF #1 \@maybe@unskip - { \__siunitx_table_collect_not_braced_aux_i:N #1 } - } - } - } - }}} - \__siunitx_table_collect_next: - } - } - { } +\@ifpackageloaded{mdwtab}{}{% + \cs_set_protected:Npn \__siunitx_table_collect_not_braced:N #1 + { + \token_if_eq_meaning:NNF #1 \relax { + \token_if_eq_meaning:NNF #1 \pltx@next@inhibitglue { + \token_if_eq_meaning:NNF #1 \removejfmglue { + \token_if_eq_meaning:NNF #1 \tex_ignorespaces:D + { + \token_if_eq_meaning:NNF #1 \tex_unskip:D + { \__siunitx_table_collect_not_braced_aux_i:N #1 } + } + }}} + \__siunitx_table_collect_next: + } } }% = % -- cgit v1.2.3