8 files changed, 36 insertions, 12 deletions
diff --git a/Master/texmf-dist/doc/latex/gentombow/README.md b/Master/texmf-dist/doc/latex/gentombow/README.md
index 6ea7f2aea55..94cbdbdac08 100644
--- a/Master/texmf-dist/doc/latex/gentombow/README.md
+++ b/Master/texmf-dist/doc/latex/gentombow/README.md
@@ -3,6 +3,16 @@
 This bundle provides a LaTeX package for generating Japanese-style
 crop marks (called 'tombow' in Japanese) for practical use in
 self-publishing.
+The core feature of "gentombow.sty" is based on pLaTeX kernel.
+
+## Supported engines
+
+All packages except bounddvi.sty works with the followings:
+- LaTeX + dvips/dvipdfmx
+- pLaTeX/upLaTeX + dvips/dvipdfmx
+- pdfLaTeX
+- LuaLaTeX
+- XeLaTeX
 
 ## Bundle contents
 
@@ -16,11 +26,23 @@ self-publishing.
     Set papersize special to DVI file.
     Can be used on LaTeX/pLaTeX/upLaTeX (with DVI output mode)
     with dvips or dvipdfmx drivers.
-    Old version (v6.0) of this package, written by Koichi INOUE
-    in 2004, is available at
-    https://www.ma.ns.tcu.ac.jp/Pages/TeX/bounddvi.sty.html
-    (dead link).
-    Now it is maintained by Hironobu Yamashita by his courtesy.
+    Old version (v6.0) was written by Koichi INOU in 2004
+    (https://www.ma.ns.tcu.ac.jp/Pages/TeX/bounddvi.sty.html),
+    and incorporated into this bundle by his courtesy.
+
+## Miscellaneous patches
+
+Some packages are unaware of crop marks defined in "gentombow";
+to cope with those packages, patches are provided here.
+- pxtextpos.sty:
+    Patch for textpos.sty (by Norman Gray).
+- pxesopic.sty:
+    Patch for eso-pic.sty (by Rolf Niepraschk).
+- pxpdfpages.sty:
+    Patch for pdfpages.sty (by Andreas Matthias).
+
+These patches can also be used independent of "gentombow",
+to avoid problems with crop marks on pLaTeX and upLaTeX.
 
 ## Character encoding
 
@@ -44,6 +66,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
 
 ## Release Date
 
-2020-09-25
+2020-10-14
 
 Hironobu Yamashita
diff --git a/Master/texmf-dist/doc/latex/gentombow/bounddvi-en.pdf b/Master/texmf-dist/doc/latex/gentombow/bounddvi-en.pdf
index fb9647d1eca..2cf419316e9 100644
--- a/Master/texmf-dist/doc/latex/gentombow/bounddvi-en.pdf
+++ b/Master/texmf-dist/doc/latex/gentombow/bounddvi-en.pdf
diff --git a/Master/texmf-dist/doc/latex/gentombow/bounddvi.pdf b/Master/texmf-dist/doc/latex/gentombow/bounddvi.pdf
index c0a2b20af65..57fed9c6c75 100644
--- a/Master/texmf-dist/doc/latex/gentombow/bounddvi.pdf
+++ b/Master/texmf-dist/doc/latex/gentombow/bounddvi.pdf
diff --git a/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.pdf b/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.pdf
index ada6318d413..ee94b6c132b 100644
--- a/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.pdf
+++ b/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.pdf
diff --git a/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.tex b/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.tex
index 763f790020f..411aad1db2d 100644
--- a/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.tex
+++ b/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.tex
@@ -3,14 +3,10 @@
   \epTeXinputencoding utf8    % ensure utf-8 encoding for platex
 \fi
 
+\RequirePackage{plautopatch}% pldocverb
 \documentclass[a4paper,dvipdfmx]{jsarticle}
 \usepackage{doc}
 \makeatletter
-%%% import from jltxdoc.cls
-\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}}
 \xspcode"5C=3 %% \
 \xspcode"22=3 %% "
 %%% dangerous bend
@@ -207,7 +203,11 @@ C系列(\texttt{c0}--\texttt{c10})と
 なお、ここでも用紙サイズが横長の場合は自動的に出力も横長になり、
 縦長の場合は自動的に縦長になります。
 
-オプションは\jMeta{トンボ形式}\texttt{-}\jMeta{出力サイズ}の書式で与えます。
+オプションは\jMeta{トンボ形式}\texttt{-}\jMeta{出力サイズ}の書式
+\footnote{他のパッケージで見られるようなkey=value形式ではないので
+注意してください。このような特殊なオプション書式を用いているのは、
+オプション名が他のクラスファイルやパッケージと衝突する可能性を
+小さくするためです。}で与えます。
 トンボ形式は、p\LaTeX の標準クラスと同じで
 \verb+tombow+, \verb+tombo+, \verb+mentuke+のいずれかを選びます
 （\verb+tombow+はジョブ情報を表示し、\verb+tombo+は表示しません。
@@ -453,6 +453,7 @@ $30\,\mathrm{mm}$にしたいとき\footnote{ここでは「本文の領域以�
                          \verb+\settombowbleed+が\verb+/TrimBox+に反映されな
                          かったバグの修正
   \item 2019/07/21 v0.9k \textsf{pdfx}パッケージとの整合性をとる改良
+  \item 2020/10/14 v0.9l \textsf{plautopatch}からトンボ対策パッチを取り込み
 \end{itemize}
 
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/gentombow/gentombow.pdf b/Master/texmf-dist/doc/latex/gentombow/gentombow.pdf
index c47dab8edbc..178bab4c521 100644
--- a/Master/texmf-dist/doc/latex/gentombow/gentombow.pdf
+++ b/Master/texmf-dist/doc/latex/gentombow/gentombow.pdf
diff --git a/Master/texmf-dist/doc/latex/gentombow/gentombow.tex b/Master/texmf-dist/doc/latex/gentombow/gentombow.tex
index 81be1fe6c52..d0bc4523ab3 100644
--- a/Master/texmf-dist/doc/latex/gentombow/gentombow.tex
+++ b/Master/texmf-dist/doc/latex/gentombow/gentombow.tex
@@ -301,6 +301,7 @@ please load \textsf{gentombow} after \textsf{geometry}.
                          Fix a bug that \verb+\settombowbleed+ is not
                          considered by \verb+/TrimBox+.
   \item 2019/07/21 v0.9k Support \textsf{pdfx} package.
+  \item 2020/10/14 v0.9l Import tombow-related patches from \textsf{plautopatch}.
 \end{itemize}
 
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/gentombow/pxgentombow.pdf b/Master/texmf-dist/doc/latex/gentombow/pxgentombow.pdf
index a0da4121e0e..d30a4509e45 100644
--- a/Master/texmf-dist/doc/latex/gentombow/pxgentombow.pdf
+++ b/Master/texmf-dist/doc/latex/gentombow/pxgentombow.pdf