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 --- .../tex/latex/plautopatch/plautopatch.sty | 9 +++- .../texmf-dist/tex/latex/plautopatch/pldocverb.sty | 41 ++++++++++++++++ .../texmf-dist/tex/latex/plautopatch/plsiunitx.sty | 54 ++++++---------------- 3 files changed, 64 insertions(+), 40 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/plautopatch/pldocverb.sty (limited to 'Master/texmf-dist/tex/latex/plautopatch') 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