From 79fbe27423e43f95ee32ae7dbc3f6fc3cb09ad8b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 6 Jun 2019 21:49:00 +0000 Subject: plautopatch (6jun19) git-svn-id: svn://tug.org/texlive/trunk@51331 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/plautopatch/plarydshln.sty | 2 +- .../tex/latex/plautopatch/plautopatch.sty | 5 ++- .../tex/latex/plautopatch/plextarydshln.sty | 4 +-- .../tex/latex/plautopatch/plextcolortbl.sty | 4 +-- .../texmf-dist/tex/latex/plautopatch/plsiunitx.sty | 39 ++++++++++++++++------ 5 files changed, 38 insertions(+), 16 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/plautopatch/plarydshln.sty b/Master/texmf-dist/tex/latex/plautopatch/plarydshln.sty index f020235b5bd..b7e2c3a1442 100644 --- a/Master/texmf-dist/tex/latex/plautopatch/plarydshln.sty +++ b/Master/texmf-dist/tex/latex/plautopatch/plarydshln.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) +% (2004/08/31 v1.71 -- 2019/02/21 v1.76) % * plcore.ltx in platex % (2001/09/26 v1.2a -- 2018/09/02 v1.3) % diff --git a/Master/texmf-dist/tex/latex/plautopatch/plautopatch.sty b/Master/texmf-dist/tex/latex/plautopatch/plautopatch.sty index da5747b34e3..378c2b32082 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/25 v0.9b Automated patches for pLaTeX/upLaTeX] + [2019/06/06 v0.9c Automated patches for pLaTeX/upLaTeX] \ifx\pfmtname\@undefined \PackageWarningNoLine{plautopatch}{% @@ -195,6 +195,9 @@ \platpc@patch@after{pgfrcs}{pxpgfrcs}% (maintained here!) % --- pxpgfmark is useful on e-(u)pTeX + dvipdfmx % --- but does no harm for other conditions +% --- [Update] pgf 2019-01-05 v3.1 (with \gdef\pgfversion{3.1}) +% ---- already supports inter-picture connections +% ---- so pxpgfmark is no longer required \platpc@patch@after{pgfcore}{pxpgfmark}% by Takayuki YATO (ZR) % special case, mainly for problematic packages diff --git a/Master/texmf-dist/tex/latex/plautopatch/plextarydshln.sty b/Master/texmf-dist/tex/latex/plautopatch/plextarydshln.sty index 53df6eaa78b..ac0059c5e46 100644 --- a/Master/texmf-dist/tex/latex/plautopatch/plextarydshln.sty +++ b/Master/texmf-dist/tex/latex/plautopatch/plextarydshln.sty @@ -7,9 +7,9 @@ % % This package is expected to be compatible with % * arydshln.sty -% (2004/08/31 v1.71 -- 2018/09/26 v1.74) +% (2004/08/31 v1.71 -- 2019/02/21 v1.76) % * plext.sty in platex -% (2001/09/26 v1.2 -- 2018/09/20 v1.2j) +% (2001/09/26 v1.2 -- 2018/10/07 v1.2k) % %% package declaration diff --git a/Master/texmf-dist/tex/latex/plautopatch/plextcolortbl.sty b/Master/texmf-dist/tex/latex/plautopatch/plextcolortbl.sty index 2a5c09a594f..08ae5bd82dc 100644 --- a/Master/texmf-dist/tex/latex/plautopatch/plextcolortbl.sty +++ b/Master/texmf-dist/tex/latex/plautopatch/plextcolortbl.sty @@ -7,9 +7,9 @@ % % This package is expected to be compatible with % * colortbl.sty -% (2012/06/21 v1.0b -- 2018/05/02 v1.0c) +% (2012/06/21 v1.0b -- 2018/12/12 v1.0d) % * plext.sty in platex -% (2001/09/26 v1.2 -- 2018/09/20 v1.2j) +% (2001/09/26 v1.2 -- 2018/10/07 v1.2k) % %% package declaration diff --git a/Master/texmf-dist/tex/latex/plautopatch/plsiunitx.sty b/Master/texmf-dist/tex/latex/plautopatch/plsiunitx.sty index 1f9a4c00dd1..f4041287d5f 100644 --- a/Master/texmf-dist/tex/latex/plautopatch/plsiunitx.sty +++ b/Master/texmf-dist/tex/latex/plautopatch/plsiunitx.sty @@ -4,7 +4,7 @@ % % This package is part of the plautopatch bundle. % https://github.com/aminophen/plautopatch -% (mostly based on lltjp-siunitx.sty 2018-11-02) +% (mostly based on lltjp-siunitx.sty 2019-06-06) % % This package is expected to be compatible with % * siunitx.sty @@ -16,7 +16,7 @@ %% package declaration \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{plsiunitx} - [2018/11/04 v0.2 siunitx package for pLaTeX/upLaTeX] + [2019/06/06 v0.3 siunitx package for pLaTeX/upLaTeX] \RequirePackageWithOptions{siunitx} \RequirePackage{plarray}% siunitx requires array @@ -27,22 +27,41 @@ %% inhibit JFM glue around tabular cell components (pLaTeX2e 2018/03/09) \@ifl@t@r{\pfmtversion}{2017/07/29}{\@firstofone}{\@gobble} {% = for pLaTeX2e 2017/07/29 or newer +% %% new table column: S and s +\bool_new:N \l__platpc_siunitx_table_collect_relax_bool +\cs_set_protected:Npn \__siunitx_table_collect_begin_s: { + \bool_set_false:N \l__platpc_siunitx_table_collect_relax_bool + \cs_set_eq:NN \__siunitx_table_collect_token:N + \__siunitx_table_collect_token_s:N + \cs_set_eq:NN \__siunitx_table_print: \__siunitx_table_print_s: + \__siunitx_table_collect_init_s: + \__siunitx_table_collect_get: +} +% \@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 } + \token_if_eq_meaning:NNTF #1 \tex_relax:D { + \bool_if:NTF \l__platpc_siunitx_table_collect_relax_bool { + \__siunitx_table_collect_not_braced_aux_i:N #1 + } { + \bool_set_true:N \l__platpc_siunitx_table_collect_relax_bool } - }}} + } { + \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: } } +% }% = % %% done -- cgit v1.2.3