plautopatch (25feb20)

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

12 files changed, 105 insertions, 42 deletions

diff --git a/Master/texmf-dist/doc/latex/plautopatch/LICENSE b/Master/texmf-dist/doc/latex/plautopatch/LICENSE
index 16f906567a4..1504ecfb7d2 100644
--- a/Master/texmf-dist/doc/latex/plautopatch/LICENSE
+++ b/Master/texmf-dist/doc/latex/plautopatch/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2018-2019 Hironobu Yamashita
+Copyright (c) 2018-2020 Hironobu Yamashita
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/Master/texmf-dist/doc/latex/plautopatch/README.md b/Master/texmf-dist/doc/latex/plautopatch/README.md
index a67ed6ec728..eb029fec19e 100644
--- a/Master/texmf-dist/doc/latex/plautopatch/README.md
+++ b/Master/texmf-dist/doc/latex/plautopatch/README.md
@@ -31,6 +31,7 @@ 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!)
 - pdfpages -> pxpdfpages (maintained here!)
 - stfloats (sttools) -> pxstfloats (pxsttools)
 - pgfrcs (pgf) -> pxpgfrcs (maintained here!)
@@ -44,39 +45,37 @@ written by Martin Scharrer.
 ## Miscellaneous
 
 This bundle may distribute some tiny patches
-together with the main package. Short information:
+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.
-    Can be used on pLaTeX/upLaTeX.
 - plextcolortbl.sty:
     Patch for colortbl.sty (by David Carlisle) to improve
     compatibility with plext.sty in pLaTeX.
-    Can be used on pLaTeX/upLaTeX.
 - plarydshln.sty:
     Patch for arydshln.sty (by Hiroshi Nakashima) to improve
-    compatibility with pLaTeX/upLaTeX kernels.
-    Can be used on pLaTeX/upLaTeX.
+    compatibility with pLaTeX kernel.
 - plextarydshln.sty:
     Patch for arydshln.sty (by Hiroshi Nakashima) to improve
     compatibility with plext.sty in pLaTeX.
-    Can be used on pLaTeX/upLaTeX.
 - plsiunitx.sty:
     Patch for siunitx.sty (by Joseph Wright) to fix
     conflict with plarray.sty (platex-tools).
-    Can be used on pLaTeX/upLaTeX.
+- pxtextpos.sty:
+    Patch for textpos.sty (by Norman Gray) 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).
-    Can be used on pLaTeX/upLaTeX.
 - pxpgfrcs.sty:
     Patch for pgfrcs.sty (part of PGF) to support
     Japanese classes for vertical writing.
-    Can be used on pLaTeX/upLaTeX.
 - pxstfloats.sty:
     Patch for stfloats.sty (sttools) to improve
-    compatibility with pLaTeX/upLaTeX.
+    compatibility with pLaTeX kernel.
     Actually part of pxsttols (https://github.com/aminophen/pxsttools)
     but included here for convenience.
 
@@ -97,6 +96,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
 
 ## Release Date
 
-2019-09-05
+2020-02-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 e3d20f56be3..5b0337c7aed 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 c6d37e605bb..cd01de621c3 100644
--- a/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex
+++ b/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex
@@ -117,6 +117,7 @@ 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  pdfpages -> pxpdfpages (maintained here!)
 \ITEMoTo  stfloats (sttools) -> pxstfloats (pxsttools)
 \ITEMoTx  pgfrcs (pgf) -> pxpgfrcs (maintained here!)
@@ -152,6 +153,7 @@ p\LaTeX/up\LaTeX{}で動作するソースと通常の\LaTeX{}ソースの
   \item 2018/11/25 v0.9b \textsf{multicol}と\textsf{doc}のサポート
   \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}のサポート
 \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 245820e0ee5..29a3a642ad9 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 cddfa40e477..fdffa696692 100644
--- a/Master/texmf-dist/doc/latex/plautopatch/plautopatch.tex
+++ b/Master/texmf-dist/doc/latex/plautopatch/plautopatch.tex
@@ -116,6 +116,7 @@ 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  pdfpages -> pxpdfpages (maintained here!)
 \ITEMoTo  stfloats (sttools) -> pxstfloats (pxsttools)
 \ITEMoTx  pgfrcs (pgf) -> pxpgfrcs (maintained here!)
@@ -154,6 +155,7 @@ a comma-separated list of them:
   \item 2018/11/25 v0.9b Add support for \textsf{multicol} and \textsf{doc}
   \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}
 \end{itemize}
 
 \end{document}
diff --git a/Master/texmf-dist/source/latex/plautopatch/Makefile b/Master/texmf-dist/source/latex/plautopatch/Makefile
deleted file mode 100644
index 5f2ef4e5d65..00000000000
--- a/Master/texmf-dist/source/latex/plautopatch/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-KANJI = -kanji=utf8
-FONTMAP = -f ipaex.map -f ptex-ipaex.map
-TEXMF = $(shell kpsewhich -var-value=TEXMFHOME)
-
-all: plautopatch.pdf plautopatch-ja.pdf
-
-.SUFFIXES: .tex .dvi .pdf
-.tex.dvi:
-	platex $(KANJI) $<
-	platex $(KANJI) $<
-	rm *.aux *.log
-.dvi.pdf:
-	dvipdfmx $(FONTMAP) $<
-
-.PHONY: install clean
-install:
-	mkdir -p ${TEXMF}/doc/platex/plautopatch
-	cp ./Makefile ${TEXMF}/doc/platex/plautopatch/
-	cp ./LICENSE ${TEXMF}/doc/platex/plautopatch/
-	cp ./README.md ${TEXMF}/doc/platex/plautopatch/
-	cp ./*.pdf ${TEXMF}/doc/platex/plautopatch/
-	cp ./*.tex ${TEXMF}/doc/platex/plautopatch/
-	mkdir -p ${TEXMF}/tex/platex/plautopatch
-	cp ./*.sty ${TEXMF}/tex/platex/plautopatch/
-clean:
-	rm -f *.dvi *.pdf
diff --git a/Master/texmf-dist/tex/latex/plautopatch/plarydshln.sty b/Master/texmf-dist/tex/latex/plautopatch/plarydshln.sty
index b7e2c3a1442..d9c26a2c7f1 100644
--- a/Master/texmf-dist/tex/latex/plautopatch/plarydshln.sty
+++ b/Master/texmf-dist/tex/latex/plautopatch/plarydshln.sty
@@ -9,7 +9,7 @@
 %   * arydshln.sty
 %     (2004/08/31 v1.71 -- 2019/02/21 v1.76)
 %   * plcore.ltx in platex
-%     (2001/09/26 v1.2a -- 2018/09/02 v1.3)
+%     (2001/09/26 v1.2a -- 2019/02/08 v1.3b)
 %
 
 %% package declaration
diff --git a/Master/texmf-dist/tex/latex/plautopatch/plautopatch.sty b/Master/texmf-dist/tex/latex/plautopatch/plautopatch.sty
index 2d9f3cb43ab..71bd8f7d0af 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}
-    [2019/09/05 v0.9d Automated patches for pLaTeX/upLaTeX]
+    [2020/02/25 v0.9e Automated patches for pLaTeX/upLaTeX]
 
 \ifx\pfmtname\@undefined
   \PackageWarningNoLine{plautopatch}{%
@@ -190,6 +190,7 @@
 \platpc@patch@before{ftnright}{pxftnright}% platex-tools
 \platpc@patch@after{multicol}{pxmulticol}% platex-tools
 \platpc@patch@after{xspace}{pxxspace}% platex-tools
+\platpc@patch@after{textpos}{pxtextpos}% (maintained here!)
 \platpc@patch@after{pdfpages}{pxpdfpages}% (maintained here!)
 \platpc@patch@before{stfloats}{pxstfloats}% pxsttools -- (!!)
 
diff --git a/Master/texmf-dist/tex/latex/plautopatch/pldocverb.sty b/Master/texmf-dist/tex/latex/plautopatch/pldocverb.sty
index cf54a623536..fc36b14ccd1 100644
--- a/Master/texmf-dist/tex/latex/plautopatch/pldocverb.sty
+++ b/Master/texmf-dist/tex/latex/plautopatch/pldocverb.sty
@@ -9,7 +9,7 @@
 %   * doc.sty
 %     (2004/02/09 v2.1b -- 2018/09/25 v2.1i)
 %   * plcore.ltx in platex
-%     (2001/09/26 v1.2a -- 2018/09/02 v1.3)
+%     (2001/09/26 v1.2a -- 2019/02/08 v1.3b)
 %
 
 %% package declaration
diff --git a/Master/texmf-dist/tex/latex/plautopatch/pxtextpos.sty b/Master/texmf-dist/tex/latex/plautopatch/pxtextpos.sty
new file mode 100644
index 00000000000..439005987ef
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/plautopatch/pxtextpos.sty
@@ -0,0 +1,85 @@
+%
+% pxtextpos.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
+%   * textpos.sty
+%     2005/10/13 v1.6a -- 2019/04/15 v1.9.1
+%
+
+%% package declaration
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{pxtextpos}
+    [2019/11/17 v0.2a Patch to textpos for (u)pLaTeX]
+
+%% preparations
+\def\pxtxtpos@pkgname{pxtextpos}
+\def\pxtxtpos@warn{\PackageWarningNoLine\pxtxtpos@pkgname}
+
+%% load it
+\RequirePackageWithOptions{textpos}
+
+%% check if \iftombow ... \fi is available
+\ifx\tombowtrue\@undefined
+  \pxtxtpos@warn{Tombow feature unavailable, aborting}
+  \expandafter\endinput
+\fi
+
+%% known definition
+\def\pxtxtpos@textblockorigin#1#2{%
+  \ifTP@abspos
+    \TP@ox=-1in    \addtolength\TP@ox{#1}
+    \TP@oy=-1in    \addtolength\TP@oy{#2}
+    \ifTP@chatter\typeout{TextBlockOrigin set to #1 x #2}\fi
+  \else
+    \PackageError{textpos}
+      {The \protect\textblockorigin\space command\MessageBreak
+       may only be used if the package was given\MessageBreak
+       the`absolute' option when it was invoked}
+      {If you want to use the \protect\textblockorigin\space command, then
+         \MessageBreak
+       invoke the package with the syntax\MessageBreak
+       \protect\usepackage[absolute]{textpos}}
+  \fi
+}
+\@onlypreamble\pxtxtpos@textblockorigin
+
+%% redefine it
+\ifx\textblockorigin\pxtxtpos@textblockorigin\else
+  \pxtxtpos@warn{%
+    Command \noexpand\textblockorigin is beyond my knowledge.\MessageBreak
+    I will apply the patch anyway, but it may break:\MessageBreak
+    Please report to the author of `\pxtxtpos@pkgname.sty'}
+\fi
+\def\textblockorigin#1#2{%
+  \ifTP@abspos
+    \TP@ox=-1in    \addtolength\TP@ox{#1}
+    \TP@oy=-1in    \addtolength\TP@oy{#2}
+    %%% addition
+    \iftombow
+      \addtolength\TP@ox{1in}\addtolength\TP@oy{1in}
+    \fi
+    %%%
+    \ifTP@chatter\typeout{TextBlockOrigin set to #1 x #2}\fi
+  \else
+    \PackageError{textpos}
+      {The \protect\textblockorigin\space command\MessageBreak
+       may only be used if the package was given\MessageBreak
+       the`absolute' option when it was invoked}
+      {If you want to use the \protect\textblockorigin\space command, then
+         \MessageBreak
+       invoke the package with the syntax\MessageBreak
+       \protect\usepackage[absolute]{textpos}}
+  \fi
+}
+
+%% reset
+\ifTP@abspos
+  \textblockorigin{0pt}{0pt}%
+\fi
+
+\endinput
+%% EOF
diff --git a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
index 3bba7d8a4a4..6d2d0438391 100644
--- a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
@@ -29,7 +29,7 @@ longdesc See the TeXLive::TLPSRC documentation for more.
 # everywhere else, or set up yet more variables. Seems fairly harmless.
 # 
 # Similarly, eplain does not (at this writing) need l3kernel for its
-# .fmt, but again, seems more maintainer to just use the variable as it is.
+# .fmt, but again, seems more maintainable to just use the variable as it is.
 # 
 # These special cases are also embedded in the tl-check-fmttriggers
 # code, so we don't get repeatedly warned about them. Maybe someday a