plautopatch (14oct20)

git-svn-id: svn://tug.org/texlive/trunk@56657 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 42 insertions, 35 deletions

diff --git a/Master/texmf-dist/doc/latex/plautopatch/README.md b/Master/texmf-dist/doc/latex/plautopatch/README.md
index 1063a4b9b48..571e2d364de 100644
--- a/Master/texmf-dist/doc/latex/plautopatch/README.md
+++ b/Master/texmf-dist/doc/latex/plautopatch/README.md
@@ -15,13 +15,13 @@ similar to those of ordinary LaTeX ones.
 
 The following patches are currently registered:
 
-- doc (latex) -> pldocverb (maintained here!)
+- doc (latex) -> pldocverb (platex-tools)
 - tracefnt (latex) -> ptrace/uptrace (platex/uplatex)
 - fltrace (latex) -> pfltrace (platex)
 - array (latex-tools) -> plarray (platex-tools)
 - array (latex-tools) + plext (platex) -> plextarray (platex-tools)
 - delarray (latex-tools) + plext (platex) -> plextdelarray (platex-tools)
-- colortbl + plext (platex) -> plextcolortbl (maintained here!)
+- colortbl + plext (platex) -> plextcolortbl (platex-tools)
 - arydshln -> plarydshln (maintained here!)
 - arydshln + plext (platex) -> plextarydshln (maintained here!)
 - siunitx -> plsiunitx (maintained here!)
@@ -32,9 +32,9 @@ The following patches are currently registered:
 - ftnright (latex-tools) -> pxftnright (platex-tools)
 - multicol (latex-tools) -> pxmulticol (platex-tools)
 - xspace (latex-tools) -> pxxspace (platex-tools)
-- textpos -> pxtextpos (maintained here!)
-- eso-pic -> pxesopic (maintained here!)
-- pdfpages -> pxpdfpages (maintained here!)
+- textpos -> pxtextpos (gentombow)
+- eso-pic -> pxesopic (gentombow)
+- pdfpages -> pxpdfpages (gentombow)
 - stfloats (sttools) -> pxstfloats (pxsttools)
 - hyperref -> pxjahyper (by Takayuki YATO)
 - pgfrcs (pgf) -> pxpgfrcs (maintained here!)
@@ -52,12 +52,6 @@ together with the main package.
 All packages are meant for use with pLaTeX/upLaTeX.
 Short information:
 
-- pldocverb.sty:
-    Patch for doc.sty (latex) to improve
-    compatibility with `\verb` redefinition in pLaTeX.
-- plextcolortbl.sty:
-    Patch for colortbl.sty (by David Carlisle) to improve
-    compatibility with plext.sty in pLaTeX.
 - plarydshln.sty:
     Patch for arydshln.sty (by Hiroshi Nakashima) to improve
     compatibility with pLaTeX kernel.
@@ -70,15 +64,6 @@ Short information:
 - 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).
-- pxesopic.sty:
-    Patch for eso-pic.sty (by Rolf Niepraschk) to support
-    Japanese-style crop marks (called 'tombow' in Japanese).
-- pxpdfpages.sty:
-    Patch for pdfpages.sty (by Andreas Matthias) to support
-    Japanese-style crop marks (called 'tombow' in Japanese).
 - pxpgfrcs.sty:
     Patch for pgfrcs.sty (part of PGF) to support
     Japanese classes for vertical writing.
@@ -105,6 +90,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
 
 ## Release Date
 
-2020-09-27
+2020-10-14
 
 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 418ebd8b87b..366bcf438fa 100644
--- a/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.pdf
+++ b/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.pdf
diff --git a/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex b/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex
index acdb3f5e393..5913374333c 100644
--- a/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex
+++ b/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex
@@ -5,6 +5,9 @@
 
 \documentclass[a4paper]{jsarticle}
 \usepackage{doc}
+\xspcode"5C=3  % \
+\xspcode"3C=3  % <
+\xspcode"3E=3  % >
 \usepackage{plautopatch}% load this here to make \GetFileInfo work
 \GetFileInfo{plautopatch.sty}
 \title{Package \textsf{plautopatch} \fileversion}
@@ -35,7 +38,11 @@ p\LaTeX/up\LaTeX{}で動作するソースと通常の\LaTeX{}ソースの
 
 \section*{動作条件}
 
-このパッケージは
+\LaTeXe~2020-10-01以降の場合は、
+カーネルが提供するフックシステムの
+\verb+\AddToHook{package/before/...}+及び
+\verb+\AddToHook{package/after/...}+を利用します。
+\LaTeXe{}が古い場合は、
 \textsf{filehook}パッケージ（Martin Scharrer氏の作）に依存します。
 
 \section*{使い方}
@@ -79,6 +86,9 @@ p\LaTeX/up\LaTeX{}で動作するソースと通常の\LaTeX{}ソースの
 \def\ITEMoTx#1 (#2) -> #3 {%
   \item \textsf{#1} (\textsf{#2})\\
     $\rightarrow$ \textsf{#3} }
+\def\ITEMxTo#1      -> #2 (#3){%
+  \item \textsf{#1}\\
+    $\rightarrow$ \textsf{#2} (\textsf{#3})}
 \def\ITEMxTx#1      -> #2 {%
   \item \textsf{#1}\\
     $\rightarrow$ \textsf{#2} }
@@ -101,13 +111,13 @@ p\LaTeX/up\LaTeX{}で動作するソースと通常の\LaTeX{}ソースの
 現在のバージョン (\filedate\space\fileversion) がサポートしているのは
 下記のパッケージです。
 \begin{itemize}
-\ITEMoTo  doc (latex) -> pldocverb (maintained here!)
+\ITEMoTo  doc (latex) -> pldocverb (platex-tools)
 \ITEMoTo  tracefnt (latex) -> ptrace/uptrace (platex/uplatex)
 \ITEMoTo  fltrace (latex) -> pfltrace (platex)
 \ITEMoTo  array (latex-tools) -> plarray (platex-tools)
 \ITEMooTo array (latex-tools) + plext (platex) -> plextarray (platex-tools)
 \ITEMooTo delarray (latex-tools) + plext (platex) -> plextdelarray (platex-tools)
-\ITEMxoTx colortbl + plext (platex) -> plextcolortbl (maintained here!)
+\ITEMxoTo colortbl + plext (platex) -> plextcolortbl (platex-tools)
 \ITEMxTx  arydshln -> plarydshln (maintained here!)
 \ITEMxoTx arydshln + plext (platex) -> plextarydshln (maintained here!)
 \ITEMxTx  siunitx -> plsiunitx (maintained here!)
@@ -118,9 +128,9 @@ p\LaTeX/up\LaTeX{}で動作するソースと通常の\LaTeX{}ソースの
 \ITEMoTo  ftnright (latex-tools) -> pxftnright (platex-tools)
 \ITEMoTo  multicol (latex-tools) -> pxmulticol (platex-tools)
 \ITEMoTo  xspace (latex-tools) -> pxxspace (platex-tools)
-\ITEMxTx  textpos -> pxtextpos (maintained here!)
-\ITEMxTx  eso-pic -> pxesopic (maintained here!)
-\ITEMxTx  pdfpages -> pxpdfpages (maintained here!)
+\ITEMxTo  textpos -> pxtextpos (gentombow)
+\ITEMxTo  eso-pic -> pxesopic (gentombow)
+\ITEMxTo  pdfpages -> pxpdfpages (gentombow)
 \ITEMoTo  stfloats (sttools) -> pxstfloats (pxsttools)
 \ITEMxTx  hyperref -> pxjahyper (by Takayuki YATO)
 \ITEMoTx  pgfrcs (pgf) -> pxpgfrcs (maintained here!)
@@ -162,6 +172,7 @@ p\LaTeX/up\LaTeX{}で動作するソースと通常の\LaTeX{}ソースの
   \item 2020/09/13 v0.9h \LaTeXe~2020-10-01では\textsf{filehook}非依存に
   \item 2020/09/25 v0.9i \textsf{pxeveryshi}と\textsf{pxatbegshi}を不要に
   \item 2020/09/27 v0.9j \textsf{eso-pic}のサポート（要\LaTeXe~2020-10-01）
+  \item 2020/10/14 v0.9k トンボ関連パッチを\textsf{gentombow}へ移動
 \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 44aefb55a5e..95ac3968416 100644
--- a/Master/texmf-dist/doc/latex/plautopatch/plautopatch.pdf
+++ b/Master/texmf-dist/doc/latex/plautopatch/plautopatch.pdf
diff --git a/Master/texmf-dist/doc/latex/plautopatch/plautopatch.tex b/Master/texmf-dist/doc/latex/plautopatch/plautopatch.tex
index b0e3cda4a50..7e7497f81a2 100644
--- a/Master/texmf-dist/doc/latex/plautopatch/plautopatch.tex
+++ b/Master/texmf-dist/doc/latex/plautopatch/plautopatch.tex
@@ -3,8 +3,11 @@
   \epTeXinputencoding utf8    % ensure utf-8 encoding for platex
 \fi
 
-\documentclass[a4paper]{jsarticle}
+\documentclass[a4paper,english]{jsarticle}
 \usepackage{doc}
+\xspcode"5C=3  % \
+\xspcode"3C=3  % <
+\xspcode"3E=3  % >
 \usepackage{plautopatch}% load this here to make \GetFileInfo work
 \GetFileInfo{plautopatch.sty}
 \title{Package \textsf{plautopatch} \fileversion}
@@ -34,8 +37,12 @@ The package is maintained on GitHub:
 
 \section*{Requirements}
 
-This package depends on \textsf{filehook} package,
-written by Martin Scharrer.
+If \LaTeXe~2020-10-01 or newer is running,
+this package uses the new hook system such as
+\verb+\AddToHook{package/before/...}+ and
+\verb+\AddToHook{package/after/...}+.
+If \LaTeXe\ is older than that, this package depends on
+\textsf{filehook} package (written by Martin Scharrer).
 
 \section*{Usage}
 
@@ -79,6 +86,9 @@ as a list separated by commas and spaces.
 \def\ITEMoTx#1 (#2) -> #3 {%
   \item \textsf{#1} (\textsf{#2})\\
     $\rightarrow$ \textsf{#3} }
+\def\ITEMxTo#1      -> #2 (#3){%
+  \item \textsf{#1}\\
+    $\rightarrow$ \textsf{#2} (\textsf{#3})}
 \def\ITEMxTx#1      -> #2 {%
   \item \textsf{#1}\\
     $\rightarrow$ \textsf{#2} }
@@ -100,13 +110,13 @@ The legend:
 
 Current version (\filedate\space\fileversion) supports the followings:
 \begin{itemize}
-\ITEMoTo  doc (latex) -> pldocverb (maintained here!)
+\ITEMoTo  doc (latex) -> pldocverb (platex-tools)
 \ITEMoTo  tracefnt (latex) -> ptrace/uptrace (platex/uplatex)
 \ITEMoTo  fltrace (latex) -> pfltrace (platex)
 \ITEMoTo  array (latex-tools) -> plarray (platex-tools)
 \ITEMooTo array (latex-tools) + plext (platex) -> plextarray (platex-tools)
 \ITEMooTo delarray (latex-tools) + plext (platex) -> plextdelarray (platex-tools)
-\ITEMxoTx colortbl + plext (platex) -> plextcolortbl (maintained here!)
+\ITEMxoTo colortbl + plext (platex) -> plextcolortbl (platex-tools)
 \ITEMxTx  arydshln -> plarydshln (maintained here!)
 \ITEMxoTx arydshln + plext (platex) -> plextarydshln (maintained here!)
 \ITEMxTx  siunitx -> plsiunitx (maintained here!)
@@ -117,9 +127,9 @@ Current version (\filedate\space\fileversion) supports the followings:
 \ITEMoTo  ftnright (latex-tools) -> pxftnright (platex-tools)
 \ITEMoTo  multicol (latex-tools) -> pxmulticol (platex-tools)
 \ITEMoTo  xspace (latex-tools) -> pxxspace (platex-tools)
-\ITEMxTx  textpos -> pxtextpos (maintained here!)
-\ITEMxTx  eso-pic -> pxesopic (maintained here!)
-\ITEMxTx  pdfpages -> pxpdfpages (maintained here!)
+\ITEMxTo  textpos -> pxtextpos (gentombow)
+\ITEMxTo  eso-pic -> pxesopic (gentombow)
+\ITEMxTo  pdfpages -> pxpdfpages (gentombow)
 \ITEMoTo  stfloats (sttools) -> pxstfloats (pxsttools)
 \ITEMxTx  hyperref -> pxjahyper (by Takayuki YATO)
 \ITEMoTx  pgfrcs (pgf) -> pxpgfrcs (maintained here!)
@@ -164,6 +174,7 @@ a comma-separated list of them:
   \item 2020/09/13 v0.9h No dependency for \textsf{filehook} on \LaTeXe~2020-10-01
   \item 2020/09/25 v0.9i Do not require \textsf{pxeveryshi} and \textsf{pxatbegshi}
   \item 2020/09/27 v0.9j Add support for \textsf{eso-pic} (\LaTeXe~2020-10-01 required)
+  \item 2020/10/14 v0.9k Move tombow-related patches to \textsf{gentombow}
 \end{itemize}
 
 \end{document}