texlive[55274] Master/texmf-dist: plautopatch (25may20)
commits+karl at tug.org
commits+karl at tug.org
Mon May 25 23:12:40 CEST 2020
Revision: 55274
http://tug.org/svn/texlive?view=revision&revision=55274
Author: karl
Date: 2020-05-25 23:12:39 +0200 (Mon, 25 May 2020)
Log Message:
-----------
plautopatch (25may20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/plautopatch/README.md
trunk/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.pdf
trunk/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex
trunk/Master/texmf-dist/doc/latex/plautopatch/plautopatch.pdf
trunk/Master/texmf-dist/doc/latex/plautopatch/plautopatch.tex
trunk/Master/texmf-dist/tex/latex/plautopatch/plautopatch.sty
Added Paths:
-----------
trunk/Master/texmf-dist/tex/latex/plautopatch/plcollcell.sty
Modified: trunk/Master/texmf-dist/doc/latex/plautopatch/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/plautopatch/README.md 2020-05-25 21:12:25 UTC (rev 55273)
+++ trunk/Master/texmf-dist/doc/latex/plautopatch/README.md 2020-05-25 21:12:39 UTC (rev 55274)
@@ -25,6 +25,7 @@
- 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 @@
- 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 @@
- 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 @@
## Release Date
-2020-02-25
+2020-05-25
Hironobu Yamashita
Modified: trunk/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex 2020-05-25 21:12:25 UTC (rev 55273)
+++ trunk/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex 2020-05-25 21:12:39 UTC (rev 55274)
@@ -111,6 +111,7 @@
\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 @@
\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 @@
\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}
Modified: trunk/Master/texmf-dist/doc/latex/plautopatch/plautopatch.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/plautopatch/plautopatch.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/plautopatch/plautopatch.tex 2020-05-25 21:12:25 UTC (rev 55273)
+++ trunk/Master/texmf-dist/doc/latex/plautopatch/plautopatch.tex 2020-05-25 21:12:39 UTC (rev 55274)
@@ -110,6 +110,7 @@
\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 @@
\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 @@
\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}
Modified: trunk/Master/texmf-dist/tex/latex/plautopatch/plautopatch.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/plautopatch/plautopatch.sty 2020-05-25 21:12:25 UTC (rev 55273)
+++ trunk/Master/texmf-dist/tex/latex/plautopatch/plautopatch.sty 2020-05-25 21:12:39 UTC (rev 55274)
@@ -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 at patch@after{arydshln}{plarydshln}% (maintained here!)
\platpc at patch@after at both{arydshln}{plext}{plextarydshln}% (maintained here!)
\platpc at patch@after{siunitx}{plsiunitx}% (maintained here!)
+\platpc at 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 at patch@before{everysel}{pxeverysel}% platex-tools
@@ -193,6 +194,12 @@
\platpc at patch@after{textpos}{pxtextpos}% (maintained here!)
\platpc at patch@after{pdfpages}{pxpdfpages}% (maintained here!)
\platpc at 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 at patch@after{hyperref}{pxjahyper}}
% for TikZ/PGF
\platpc at patch@after{pgfrcs}{pxpgfrcs}% (maintained here!)
Added: trunk/Master/texmf-dist/tex/latex/plautopatch/plcollcell.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/plautopatch/plcollcell.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/plautopatch/plcollcell.sty 2020-05-25 21:12:39 UTC (rev 55274)
@@ -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 at insert@column{%
+ \the at toks \the \@tempcnta
+ \relax \pltx at next@inhibitglue
+ \ignorespaces \@sharp \unskip \removejfmglue
+ \the at toks \the \count@ \relax}
+% -- check
+\ifx\insert at column\plclcl at insert@column\else
+ \PackageWarningNoLine{pxcollcell}
+ {Patch to \noexpand\collectcell unsupported}
+ \expandafter\endinput
+\fi \let\plclcl at insert@column\@undefined
+
+%% \plclcl at patch@cmd\CMD{<orig>}{<new>}
+\@onlypreamble\plclcl at patch@cmd
+\def\plclcl at patch@cmd#1#2#3{%
+ \def\plclcl at next##1#2##2\plclcl at mark##3\plclcl at fin{%
+ \ifx\plclcl at mark##3\plclcl at mark
+ \let\plclcl at fragment\relax
+ \else
+ \def\plclcl at fragment{##2}%
+ \def#1{##1#3##2}%
+ \fi}%
+ \expandafter\plclcl at next#1\plclcl at mark#2\plclcl at mark\plclcl at fin}
+% -- prepend (TODO: \kern0pt enables \inhibitglue effect. why?)
+\plclcl at patch@cmd\collcell at beforeuser
+ {\ignorespaces}
+ {\kern0pt\inhibitglue\ignorespaces}
+\ifx\plclcl at fragment\relax
+ \PackageWarningNoLine{pxcollcell}
+ {Patch to \noexpand\collcell at beforeuser failed}
+\fi
+
+%% code from collcell.sty
+\def\plclcl at collectcell#1#2\ignorespaces{%
+ \begingroup
+ \collect at cell@count\z@
+ \collect at cell@toks{}%
+ \let\collect at cell@spaces\empty
+ \def\collect at cell@end{%
+ \expandafter\endgroup
+ \expandafter\collcell at beforeuser
+ \expandafter\ccell at swap\expandafter{\the\collect at cell@toks}{#1}%
+ \collcell at afteruser
+ }%
+ \collect at cell@look#2%
+}
+% -- check
+\ifx\collectcell\plclcl at collectcell\else
+ \PackageWarningNoLine{pxcollcell}
+ {Patching \noexpand\collect at cell@arg but maybe unsafe}
+\fi \let\plclcl at collectcell\@undefined
+% -- redefine to skip \relax\pltx at next@inhibitglue
+\def\collectcell#1#2\relax\pltx at next@inhibitglue\ignorespaces{%
+ \begingroup
+ \collect at cell@count\z@
+ \collect at cell@toks{}%
+ \let\collect at cell@spaces\empty
+ \def\collect at cell@end{%
+ \expandafter\endgroup
+ \expandafter\collcell at beforeuser
+ \expandafter\ccell at swap\expandafter{\the\collect at cell@toks}{#1}%
+ \collcell at afteruser
+ }%
+ \collect at cell@look#2%
+}
+
+%% code from collcell.sty
+\def\plclcl at collect@cell at arg#1{%
+ \cc at case
+ \\{\collect at cell@cr#1}%
+ \end{\collect at cell@checkend}%
+ \csname{\collect at cell@checkcsname}%
+ \unskip{%
+ \let\collect at cell@spaces\empty
+ %\collect at cell@addarg{#1}% do not include the \unskip
+ \collect at cell@look%
+ }%
+ \@sharp{%
+ \expandafter\collect at cell@addarg\expandafter{#1}%
+ \collect at cell@look
+ }%
+ \collectcell{%
+ \advance\collect at cell@count by \@ne
+ \collect at cell@addcc%
+ }%
+ \endcollectcell{%
+ \ifnum\collect at cell@count=\z@
+ \expandafter\collect at cell@end
+ \else
+ \expandafter\endgroup
+ \expandafter\collect at cell@addarg\expandafter
+ {\expandafter{\the\collect at cell@toks}}%
+ \advance\collect at cell@count by \m at ne%
+ \expandafter\collect at cell@look
+ \fi
+ }%
+ \cci{%
+ \collect at cell@look
+ }%
+ \default{%
+ \expandafter\ccell at swap\expandafter
+ {\csname endtabular*\endcsname\endtabular\endarray}{\in@{#1}}%
+ \ifin@
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ {\collect at cell@cr\\#1}%
+ {%
+ \collect at cell@addarg{#1}%
+ \collect at cell@look
+ }%
+ }%
+ \endcc at case
+}
+% -- check
+\ifx\collect at cell@arg\plclcl at collect@cell at arg\else
+ \PackageWarningNoLine{pxcollcell}
+ {Patching \noexpand\collect at cell@arg but maybe unsafe}
+\fi \let\plclcl at collect@cell at arg\@undefined
+% -- redefine to skip \removejfmglue
+\def\collect at cell@arg#1{%
+ \cc at case
+ \\{\collect at cell@cr#1}%
+ \end{\collect at cell@checkend}%
+ \csname{\collect at cell@checkcsname}%
+ \unskip{%
+ \let\collect at cell@spaces\empty
+ %\collect at cell@addarg{#1}% do not include the \unskip
+ \collect at cell@look%
+ }%
+ \@sharp{%
+ \expandafter\collect at cell@addarg\expandafter{#1}%
+ \collect at cell@look
+ }%
+ \collectcell{%
+ \advance\collect at cell@count by \@ne
+ \collect at cell@addcc%
+ }%
+ \endcollectcell{%
+ \ifnum\collect at cell@count=\z@
+ \expandafter\collect at cell@end
+ \else
+ \expandafter\endgroup
+ \expandafter\collect at cell@addarg\expandafter
+ {\expandafter{\the\collect at cell@toks}}%
+ \advance\collect at cell@count by \m at ne%
+ \expandafter\collect at cell@look
+ \fi
+ }%
+ \cci{%
+ \collect at cell@look
+ }%
+ %%% BEGIN
+ \removejfmglue{%
+ \collect at cell@look
+ }%
+ %%% END
+ \default{%
+ \expandafter\ccell at swap\expandafter
+ {\csname endtabular*\endcsname\endtabular\endarray}{\in@{#1}}%
+ \ifin@
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ {\collect at cell@cr\\#1}%
+ {%
+ \collect at cell@addarg{#1}%
+ \collect at cell@look
+ }%
+ }%
+ \endcc at case
+}
+
+%% all done
+
+\endinput
Property changes on: trunk/Master/texmf-dist/tex/latex/plautopatch/plcollcell.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
More information about the tex-live-commits
mailing list.