From 67008ddca6c6e1a902f7ba7207dc1566e7e36640 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 25 May 2020 21:12:39 +0000 Subject: plautopatch (25may20) git-svn-id: svn://tug.org/texlive/trunk@55274 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/plautopatch/README.md | 7 +- .../doc/latex/plautopatch/plautopatch-ja.pdf | Bin 101189 -> 101660 bytes .../doc/latex/plautopatch/plautopatch-ja.tex | 4 + .../doc/latex/plautopatch/plautopatch.pdf | Bin 35001 -> 35223 bytes .../doc/latex/plautopatch/plautopatch.tex | 4 + .../tex/latex/plautopatch/plautopatch.sty | 9 +- .../tex/latex/plautopatch/plcollcell.sty | 199 +++++++++++++++++++++ 7 files changed, 221 insertions(+), 2 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/plautopatch/plcollcell.sty (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/plautopatch/README.md b/Master/texmf-dist/doc/latex/plautopatch/README.md index eb029fec19e..6799dc2f80a 100644 --- a/Master/texmf-dist/doc/latex/plautopatch/README.md +++ b/Master/texmf-dist/doc/latex/plautopatch/README.md @@ -25,6 +25,7 @@ The following patches are currently registered: - arydshln -> plarydshln (maintained here!) - arydshln + plext (platex) -> plextarydshln (maintained here!) - siunitx -> plsiunitx (maintained here!) +- collcell -> plcollcell (maintained here!) - everysel (ms) -> pxeverysel (platex-tools) - everyshi (ms) -> pxeveryshi (platex-tools) - atbegshi (oberdiek) -> pxatbegshi (platex-tools) @@ -34,6 +35,7 @@ The following patches are currently registered: - textpos -> pxtextpos (maintained here!) - pdfpages -> pxpdfpages (maintained here!) - stfloats (sttools) -> pxstfloats (pxsttools) +- hyperref -> pxjahyper (by Takayuki YATO) - pgfrcs (pgf) -> pxpgfrcs (maintained here!) - pgfcore (pgf) -> pxpgfmark (by Takayuki YATO) @@ -64,6 +66,9 @@ Short information: - plsiunitx.sty: Patch for siunitx.sty (by Joseph Wright) to fix conflict with plarray.sty (platex-tools). +- plcollcell.sty: + Patch for collcell.sty (by Martin Scharrer) to fix + conflict with plarray.sty (platex-tools). - pxtextpos.sty: Patch for textpos.sty (by Norman Gray) to support Japanese-style crop marks (called 'tombow' in Japanese). @@ -96,6 +101,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2020-02-25 +2020-05-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 5b0337c7aed..775fd4bb436 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 cd01de621c3..c09f3db8b1a 100644 --- a/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex +++ b/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex @@ -111,6 +111,7 @@ p\LaTeX/up\LaTeX{}で動作するソースと通常の\LaTeX{}ソースの \ITEMxTx arydshln -> plarydshln (maintained here!) \ITEMxoTx arydshln + plext (platex) -> plextarydshln (maintained here!) \ITEMxTx siunitx -> plsiunitx (maintained here!) +\ITEMxTx collcell -> plcollcell (maintained here!) \ITEMoTo everysel (ms) -> pxeverysel (platex-tools) \ITEMoTo everyshi (ms) -> pxeveryshi (platex-tools) \ITEMoTo atbegshi (oberdiek) -> pxatbegshi (platex-tools) @@ -120,6 +121,7 @@ p\LaTeX/up\LaTeX{}で動作するソースと通常の\LaTeX{}ソースの \ITEMxTx textpos -> pxtextpos (maintained here!) \ITEMxTx pdfpages -> pxpdfpages (maintained here!) \ITEMoTo stfloats (sttools) -> pxstfloats (pxsttools) +\ITEMxTx hyperref -> pxjahyper (by Takayuki YATO) \ITEMoTx pgfrcs (pgf) -> pxpgfrcs (maintained here!) \ITEMoTx pgfcore (pgf) -> pxpgfmark (by Takayuki YATO) \end{itemize} @@ -154,6 +156,8 @@ p\LaTeX/up\LaTeX{}で動作するソースと通常の\LaTeX{}ソースの \item 2019/06/06 v0.9c \textsf{siunitx}のパッチ改良 \item 2019/09/05 v0.9d \textsf{xspace}と\textsf{stfloats}のサポート \item 2020/02/25 v0.9e \textsf{textpos}のサポート + \item 2020/05/05 v0.9f \textsf{collcell}のサポート + \item 2020/05/25 v0.9g \textsf{pxjahyper}の自動読込 \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 29a3a642ad9..d86957c8279 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 fdffa696692..d415bda8291 100644 --- a/Master/texmf-dist/doc/latex/plautopatch/plautopatch.tex +++ b/Master/texmf-dist/doc/latex/plautopatch/plautopatch.tex @@ -110,6 +110,7 @@ Current version (\filedate\space\fileversion) supports the followings: \ITEMxTx arydshln -> plarydshln (maintained here!) \ITEMxoTx arydshln + plext (platex) -> plextarydshln (maintained here!) \ITEMxTx siunitx -> plsiunitx (maintained here!) +\ITEMxTx collcell -> plcollcell (maintained here!) \ITEMoTo everysel (ms) -> pxeverysel (platex-tools) \ITEMoTo everyshi (ms) -> pxeveryshi (platex-tools) \ITEMoTo atbegshi (oberdiek) -> pxatbegshi (platex-tools) @@ -119,6 +120,7 @@ Current version (\filedate\space\fileversion) supports the followings: \ITEMxTx textpos -> pxtextpos (maintained here!) \ITEMxTx pdfpages -> pxpdfpages (maintained here!) \ITEMoTo stfloats (sttools) -> pxstfloats (pxsttools) +\ITEMxTx hyperref -> pxjahyper (by Takayuki YATO) \ITEMoTx pgfrcs (pgf) -> pxpgfrcs (maintained here!) \ITEMoTx pgfcore (pgf) -> pxpgfmark (by Takayuki YATO) \end{itemize} @@ -156,6 +158,8 @@ a comma-separated list of them: \item 2019/06/06 v0.9c Update patch for \textsf{siunitx} \item 2019/09/05 v0.9d Add support for \textsf{xspace} and \textsf{stfloats} \item 2020/02/25 v0.9e Add support for \textsf{textpos} + \item 2020/05/05 v0.9f Add support for \textsf{collcell} + \item 2020/05/25 v0.9g Automatically load \textsf{pxjahyper} \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 71bd8f7d0af..30707cb8b4d 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} - [2020/02/25 v0.9e Automated patches for pLaTeX/upLaTeX] + [2020/05/25 v0.9g Automated patches for pLaTeX/upLaTeX] \ifx\pfmtname\@undefined \PackageWarningNoLine{plautopatch}{% @@ -182,6 +182,7 @@ \platpc@patch@after{arydshln}{plarydshln}% (maintained here!) \platpc@patch@after@both{arydshln}{plext}{plextarydshln}% (maintained here!) \platpc@patch@after{siunitx}{plsiunitx}% (maintained here!) +\platpc@patch@after{collcell}{plcollcell}% (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 @@ -193,6 +194,12 @@ \platpc@patch@after{textpos}{pxtextpos}% (maintained here!) \platpc@patch@after{pdfpages}{pxpdfpages}% (maintained here!) \platpc@patch@before{stfloats}{pxstfloats}% pxsttools -- (!!) +% --- in most cases, pxjahyper works without explicit options +% --- however, in case a user specifies some, delay it +% --- [TODO] if \AtBeginDocument{\usepackage{hyperref}} appears, +% ---- writing to \jobname.out (= 'jacommentline' feature) +% ---- does not work because it's too late. +\AtBeginDocument{\platpc@patch@after{hyperref}{pxjahyper}} % for TikZ/PGF \platpc@patch@after{pgfrcs}{pxpgfrcs}% (maintained here!) diff --git a/Master/texmf-dist/tex/latex/plautopatch/plcollcell.sty b/Master/texmf-dist/tex/latex/plautopatch/plcollcell.sty new file mode 100644 index 00000000000..cee4efba27e --- /dev/null +++ b/Master/texmf-dist/tex/latex/plautopatch/plcollcell.sty @@ -0,0 +1,199 @@ +% +% plcollcell.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 +% * collcell.sty +% (2011/02/27 v0.5) +% * plarray.sty in platex-tools +% (2018/03/12 v0.1e -- 2018/10/27 v0.1h) +% + +\NeedsTeXFormat{pLaTeX2e} +\ProvidesPackage{plcollcell} + [2020/05/05 v0.1 Tabular extension package for pLaTeX/upLaTeX] +\RequirePackageWithOptions{collcell} +\RequirePackage{plarray}% collcell.sty requires array.sty + +%% code from plarray.sty (for pLaTeX2e 2018/03/09 or later) +\def\plclcl@insert@column{% + \the@toks \the \@tempcnta + \relax \pltx@next@inhibitglue + \ignorespaces \@sharp \unskip \removejfmglue + \the@toks \the \count@ \relax} +% -- check +\ifx\insert@column\plclcl@insert@column\else + \PackageWarningNoLine{pxcollcell} + {Patch to \noexpand\collectcell unsupported} + \expandafter\endinput +\fi \let\plclcl@insert@column\@undefined + +%% \plclcl@patch@cmd\CMD{}{} +\@onlypreamble\plclcl@patch@cmd +\def\plclcl@patch@cmd#1#2#3{% + \def\plclcl@next##1#2##2\plclcl@mark##3\plclcl@fin{% + \ifx\plclcl@mark##3\plclcl@mark + \let\plclcl@fragment\relax + \else + \def\plclcl@fragment{##2}% + \def#1{##1#3##2}% + \fi}% + \expandafter\plclcl@next#1\plclcl@mark#2\plclcl@mark\plclcl@fin} +% -- prepend (TODO: \kern0pt enables \inhibitglue effect. why?) +\plclcl@patch@cmd\collcell@beforeuser + {\ignorespaces} + {\kern0pt\inhibitglue\ignorespaces} +\ifx\plclcl@fragment\relax + \PackageWarningNoLine{pxcollcell} + {Patch to \noexpand\collcell@beforeuser failed} +\fi + +%% code from collcell.sty +\def\plclcl@collectcell#1#2\ignorespaces{% + \begingroup + \collect@cell@count\z@ + \collect@cell@toks{}% + \let\collect@cell@spaces\empty + \def\collect@cell@end{% + \expandafter\endgroup + \expandafter\collcell@beforeuser + \expandafter\ccell@swap\expandafter{\the\collect@cell@toks}{#1}% + \collcell@afteruser + }% + \collect@cell@look#2% +} +% -- check +\ifx\collectcell\plclcl@collectcell\else + \PackageWarningNoLine{pxcollcell} + {Patching \noexpand\collect@cell@arg but maybe unsafe} +\fi \let\plclcl@collectcell\@undefined +% -- redefine to skip \relax\pltx@next@inhibitglue +\def\collectcell#1#2\relax\pltx@next@inhibitglue\ignorespaces{% + \begingroup + \collect@cell@count\z@ + \collect@cell@toks{}% + \let\collect@cell@spaces\empty + \def\collect@cell@end{% + \expandafter\endgroup + \expandafter\collcell@beforeuser + \expandafter\ccell@swap\expandafter{\the\collect@cell@toks}{#1}% + \collcell@afteruser + }% + \collect@cell@look#2% +} + +%% code from collcell.sty +\def\plclcl@collect@cell@arg#1{% + \cc@case + \\{\collect@cell@cr#1}% + \end{\collect@cell@checkend}% + \csname{\collect@cell@checkcsname}% + \unskip{% + \let\collect@cell@spaces\empty + %\collect@cell@addarg{#1}% do not include the \unskip + \collect@cell@look% + }% + \@sharp{% + \expandafter\collect@cell@addarg\expandafter{#1}% + \collect@cell@look + }% + \collectcell{% + \advance\collect@cell@count by \@ne + \collect@cell@addcc% + }% + \endcollectcell{% + \ifnum\collect@cell@count=\z@ + \expandafter\collect@cell@end + \else + \expandafter\endgroup + \expandafter\collect@cell@addarg\expandafter + {\expandafter{\the\collect@cell@toks}}% + \advance\collect@cell@count by \m@ne% + \expandafter\collect@cell@look + \fi + }% + \cci{% + \collect@cell@look + }% + \default{% + \expandafter\ccell@swap\expandafter + {\csname endtabular*\endcsname\endtabular\endarray}{\in@{#1}}% + \ifin@ + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi + {\collect@cell@cr\\#1}% + {% + \collect@cell@addarg{#1}% + \collect@cell@look + }% + }% + \endcc@case +} +% -- check +\ifx\collect@cell@arg\plclcl@collect@cell@arg\else + \PackageWarningNoLine{pxcollcell} + {Patching \noexpand\collect@cell@arg but maybe unsafe} +\fi \let\plclcl@collect@cell@arg\@undefined +% -- redefine to skip \removejfmglue +\def\collect@cell@arg#1{% + \cc@case + \\{\collect@cell@cr#1}% + \end{\collect@cell@checkend}% + \csname{\collect@cell@checkcsname}% + \unskip{% + \let\collect@cell@spaces\empty + %\collect@cell@addarg{#1}% do not include the \unskip + \collect@cell@look% + }% + \@sharp{% + \expandafter\collect@cell@addarg\expandafter{#1}% + \collect@cell@look + }% + \collectcell{% + \advance\collect@cell@count by \@ne + \collect@cell@addcc% + }% + \endcollectcell{% + \ifnum\collect@cell@count=\z@ + \expandafter\collect@cell@end + \else + \expandafter\endgroup + \expandafter\collect@cell@addarg\expandafter + {\expandafter{\the\collect@cell@toks}}% + \advance\collect@cell@count by \m@ne% + \expandafter\collect@cell@look + \fi + }% + \cci{% + \collect@cell@look + }% + %%% BEGIN + \removejfmglue{% + \collect@cell@look + }% + %%% END + \default{% + \expandafter\ccell@swap\expandafter + {\csname endtabular*\endcsname\endtabular\endarray}{\in@{#1}}% + \ifin@ + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi + {\collect@cell@cr\\#1}% + {% + \collect@cell@addarg{#1}% + \collect@cell@look + }% + }% + \endcc@case +} + +%% all done + +\endinput -- cgit v1.2.3