texlive[56657] Master/texmf-dist: plautopatch (14oct20)
commits+karl at tug.org
commits+karl at tug.org
Wed Oct 14 23:43:07 CEST 2020
Revision: 56657
http://tug.org/svn/texlive?view=revision&revision=56657
Author: karl
Date: 2020-10-14 23:43:07 +0200 (Wed, 14 Oct 2020)
Log Message:
-----------
plautopatch (14oct20)
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
trunk/Master/texmf-dist/tex/latex/plautopatch/plextarydshln.sty
trunk/Master/texmf-dist/tex/latex/plautopatch/pxpgfrcs.sty
Removed Paths:
-------------
trunk/Master/texmf-dist/tex/latex/plautopatch/pldocverb.sty
trunk/Master/texmf-dist/tex/latex/plautopatch/plextcolortbl.sty
trunk/Master/texmf-dist/tex/latex/plautopatch/pxesopic.sty
trunk/Master/texmf-dist/tex/latex/plautopatch/pxpdfpages.sty
trunk/Master/texmf-dist/tex/latex/plautopatch/pxtextpos.sty
Modified: trunk/Master/texmf-dist/doc/latex/plautopatch/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/plautopatch/README.md 2020-10-14 21:42:05 UTC (rev 56656)
+++ trunk/Master/texmf-dist/doc/latex/plautopatch/README.md 2020-10-14 21:43:07 UTC (rev 56657)
@@ -15,13 +15,13 @@
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 @@
- 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 @@
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 @@
- 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 @@
## Release Date
-2020-09-27
+2020-10-14
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-10-14 21:42:05 UTC (rev 56656)
+++ trunk/Master/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex 2020-10-14 21:43:07 UTC (rev 56657)
@@ -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 @@
\section*{動作条件}
-このパッケージは
+\LaTeXe~2020-10-01以降の場合は、
+カーネルが提供するフックシステムの
+\verb+\AddToHook{package/before/...}+及び
+\verb+\AddToHook{package/after/...}+を利用します。
+\LaTeXe{}が古い場合は、
\textsf{filehook}パッケージ（Martin Scharrer氏の作）に依存します。
\section*{使い方}
@@ -79,6 +86,9 @@
\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 @@
現在のバージョン (\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 @@
\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 @@
\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}
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-10-14 21:42:05 UTC (rev 56656)
+++ trunk/Master/texmf-dist/doc/latex/plautopatch/plautopatch.tex 2020-10-14 21:43:07 UTC (rev 56657)
@@ -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 @@
\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 @@
\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 @@
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 @@
\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 @@
\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}
Modified: trunk/Master/texmf-dist/tex/latex/plautopatch/plautopatch.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/plautopatch/plautopatch.sty 2020-10-14 21:42:05 UTC (rev 56656)
+++ trunk/Master/texmf-dist/tex/latex/plautopatch/plautopatch.sty 2020-10-14 21:43:07 UTC (rev 56657)
@@ -8,10 +8,10 @@
\NeedsTeXFormat{LaTeX2e}% not pLaTeX2e on purpose!
\ProvidesPackage{plautopatch}
- [2020/09/27 v0.9j Automated patches for pLaTeX/upLaTeX]
+ [2020/10/14 v0.9k Automated patches for pLaTeX/upLaTeX]
\ifx\pfmtname\@undefined
- \PackageWarningNoLine{plautopatch}{%
+ \PackageInfo{plautopatch}{%
This package is meant for pLaTeX/upLaTeX,\MessageBreak
you will not need it.}
\expandafter\endinput
@@ -195,7 +195,7 @@
% register patches
-\platpc at patch@after{doc}{pldocverb}% (maintained here!)
+\platpc at patch@after{doc}{pldocverb}% platex-tools
\ifx\enablecjktoken\@undefined
\platpc at patch@after{tracefnt}{ptrace}% platex
\else
@@ -205,7 +205,7 @@
\platpc at patch@after{array}{plarray}% platex-tools
\platpc at patch@after at both{array}{plext}{plextarray}% platex-tools
\platpc at patch@after at both{delarray}{plext}{plextdelarray}% platex-tools
-\platpc at patch@after at both{colortbl}{plext}{plextcolortbl}% (maintained here!)
+\platpc at patch@after at both{colortbl}{plext}{plextcolortbl}% platex-tools
\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!)
@@ -226,12 +226,12 @@
\platpc at patch@before{ftnright}{pxftnright}% platex-tools
\platpc at patch@after{multicol}{pxmulticol}% platex-tools
\platpc at patch@after{xspace}{pxxspace}% platex-tools
-\platpc at patch@after{textpos}{pxtextpos}% (maintained here!)
+\platpc at patch@after{textpos}{pxtextpos}% gentombow
% --- until LaTeX2e 2020-10-01, patching eso-pic automatically
% --- is not supported by pxesopic
\@ifl at t@r{\fmtversion}{2020/10/01}%
- {\platpc at patch@before{eso-pic}{pxesopic}}{}% (maintained here!)
-\platpc at patch@after{pdfpages}{pxpdfpages}% (maintained here!)
+ {\platpc at patch@before{eso-pic}{pxesopic}}{}% gentombow
+\platpc at patch@after{pdfpages}{pxpdfpages}% gentombow
\platpc at patch@before{stfloats}{pxstfloats}% pxsttools -- (!!)
% --- in most cases, pxjahyper works without explicit options
% --- however, in case a user specifies some, delay it
@@ -238,7 +238,8 @@
% --- [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}}
+\AtBeginDocument
+ {\platpc at patch@after{hyperref}{pxjahyper}}% by Takayuki YATO (ZR)
% for TikZ/PGF
\platpc at patch@after{pgfrcs}{pxpgfrcs}% (maintained here!)
Deleted: trunk/Master/texmf-dist/tex/latex/plautopatch/pldocverb.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/plautopatch/pldocverb.sty 2020-10-14 21:42:05 UTC (rev 56656)
+++ trunk/Master/texmf-dist/tex/latex/plautopatch/pldocverb.sty 2020-10-14 21:43:07 UTC (rev 56657)
@@ -1,41 +0,0 @@
-%
-% pldocverb.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
-% * doc.sty
-% (2004/02/09 v2.1b -- 2020/06/15 v2.1m)
-% * plcore.ltx in platex
-% (2001/09/26 v1.2a -- 2020/03/05 v1.3e)
-%
-
-%% package declaration
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{pldocverb}
- [2018/11/25 v0.2 doc package for pLaTeX/upLaTeX]
-\RequirePackage{doc}
-% doc.sty conditionally requires multicol.sty without passing options
-\IfFileExists{pxmulticol.sty}{\RequirePackage{pxmulticol}}{}
-
-%% enable \xkanjiskip insertion,
-%% while preserving beginning space characters (pLaTeX2e 2017/10/28)
-\@ifl at t@r{\pfmtversion}{2017/10/28}{\@firstoftwo}{\@secondoftwo}
-{% = for pLaTeX2e 2017/10/28 or newer
-\def\verb{\relax\ifmmode\hbox\else\leavevmode\vadjust{}\fi
- \bgroup \let\do\do at noligs \verbatim at nolig@list
- \ttfamily \verb at eol@error \let\do\@makeother \dospecials
- \@ifstar{\@sverb}{\@vobeyspaces \frenchspacing \@sverb}}
-}% =
-{% = for pLaTeX2e 2017/09/26 or older
-\def\verb{\relax\ifmmode\hbox\else\leavevmode\fi
- \bgroup \let\do\do at noligs \verbatim at nolig@list
- \ttfamily \verb at eol@error \let\do\@makeother \dospecials
- \@ifstar{\@sverb}{\@vobeyspaces \frenchspacing \@sverb}}
-}% =
-%
-%% done
-
-\endinput
Modified: trunk/Master/texmf-dist/tex/latex/plautopatch/plextarydshln.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/plautopatch/plextarydshln.sty 2020-10-14 21:42:05 UTC (rev 56656)
+++ trunk/Master/texmf-dist/tex/latex/plautopatch/plextarydshln.sty 2020-10-14 21:43:07 UTC (rev 56657)
@@ -9,7 +9,7 @@
% * arydshln.sty
% (2004/08/31 v1.71 -- 2019/02/21 v1.76)
% * plext.sty in platex
-% (2001/09/26 v1.2 -- 2019/09/29 v1.2l)
+% (2001/09/26 v1.2 -- 2020/10/07 v1.2m)
%
%% package declaration
Deleted: trunk/Master/texmf-dist/tex/latex/plautopatch/plextcolortbl.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/plautopatch/plextcolortbl.sty 2020-10-14 21:42:05 UTC (rev 56656)
+++ trunk/Master/texmf-dist/tex/latex/plautopatch/plextcolortbl.sty 2020-10-14 21:43:07 UTC (rev 56657)
@@ -1,39 +0,0 @@
-%
-% plextcolortbl.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
-% * colortbl.sty
-% (2012/06/21 v1.0b -- 2020/01/04 v1.0e)
-% * plext.sty in platex
-% (2001/09/26 v1.2 -- 2019/09/29 v1.2l)
-%
-
-%% package declaration
-\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{plextcolortbl}
- [2018/09/19 v0.1a Merge plext and colortbl]
-\RequirePackage{plextarray}% colortbl requires array
-\RequirePackageWithOptions{colortbl}
-
-%% patching internal code for colortbl.sty
-%
-\AtBeginDocument{%
- % recover \@tabarray from plextarray.sty
- \def\@tabarray{\@ifnextchar<\p at tabarray{\p at tabarray<Z>}}
- % change \p at tabarray instead
- \expandafter\def\expandafter\p at tabarray
- \expandafter<\expandafter#\expandafter1\expandafter>\expandafter{%
- \expandafter\CT at start\p at tabarray<#1>}%
-}
-%
-\def\endarray{\crcr \egroup \egroup
- \@end at alignbox %% added from plext.sty
- \@arrayright \gdef\@preamble{}\CT at end}%
-%
-%% done
-
-\endinput
Deleted: trunk/Master/texmf-dist/tex/latex/plautopatch/pxesopic.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/plautopatch/pxesopic.sty 2020-10-14 21:42:05 UTC (rev 56656)
+++ trunk/Master/texmf-dist/tex/latex/plautopatch/pxesopic.sty 2020-10-14 21:43:07 UTC (rev 56657)
@@ -1,177 +0,0 @@
-%
-% pxesopic.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
-% * eso-pic.sty
-% ????/??/?? v?.? -- 2018/04/12 v2.0h
-%
-% --------------------------------------------------------------
-% [Note]
-% The package ``pxesopic.sty'' relies heavily on internals
-% of ``plautopatch.sty''
-% --------------------------------------------------------------
-%
-
-%% package declaration
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{pxesopic}
- [2020/09/27 v0.2a Patch to eso-pic for tombow]
-
-%% preparations
-\def\pxesop at pkgname{pxesopic}
-\def\pxesop at error{\PackageError\pxesop at pkgname}
-\def\pxesop at warn{\PackageWarningNoLine\pxesop at pkgname}
-\let\pxesop at debug\@gobble
-\def\pxesop at debug#1{\typeout{\pxesop at pkgname: [DEBUG] #1}}% for debug
-
-%% hooks
-\ifx\declare at file@substitution\@undefined
- % LaTeX2e 2020-02-02 PL5 or older
- \RequirePackage{filehook}
- \let\pxesop at ExecuteAfterPackage=\AtEndOfPackageFile
- \let\pxesop at ExecuteBeforePackage=\AtBeginOfPackageFile
-\else
- % LaTeX2e 2020-10-01 or newer
- \def\pxesop at ExecuteAfterPackage#1{\AddToHook{package/after/#1}}
- \def\pxesop at ExecuteBeforePackage#1{\AddToHook{package/before/#1}}
-\fi
-
-%% the contents of \AtBeginShipout is dependent on \iftombow;
-%% delay execution of \AtBeginShipout inside ``eso-pic.sty''
-%% until \AtBeginDocument, to support both (u)pLaTeX kernel
-%% and ``gentombow.sty''
-\RequirePackage{atbegshi}% eso-pic requires atbegshi
-\pxesop at ExecuteBeforePackage{eso-pic}{\pxesop at before}
-\pxesop at ExecuteAfterPackage{eso-pic}{\pxesop at after}
-%
-\def\pxesop at before{%
- \let\pxesop at AtBeginShipout\AtBeginShipout
- \def\AtBeginShipout##1{\def\pxesop at hook{##1}}% hide it
- \pxesop at debug{\noexpand\AtBeginShipout disabled}%
- \let\pxesop at before\relax
-}
-\def\pxesop at after{%
- \let\AtBeginShipout\pxesop at AtBeginShipout % restore
- \let\pxesop at AtBeginShipout\relax
- \pxesop at debug{\noexpand\AtBeginShipout restored}%
- \let\@unknownoptionerror\relax %% avoid an error
- \pxesop at debug{\noexpand\@unknownoptionerror disabled}%
- \let\pxesop at after\relax
-}
-%%
-
-%% load it; be careful not to cause unknown option error!
-\expandafter\ifx\csname @unknownoptionerror\endcsname
- \pxesop at error{Failed to save \noexpand\@unknownoptionerror}\@ehc
-\fi
-\let\pxesop at unknownoptionerror\@unknownoptionerror
-%
-\chardef\pxesop at status\z@
-\@ifpackageloaded{plautopatch}{%
- \expandafter\ifx\csname platpc at begin@eso-pic\endcsname\relax
- % ``plautopatch.sty'' is loaded but the macro is \relax
- % => means that ``pxesopic.sty'' is automatically loaded
- \chardef\pxesop at status\@ne
- \fi
-}{}
-%
-%% pass all options to keyval-style ``eso-pic.sty''
-\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{eso-pic}}
-\ProcessOptions\relax
-\RequirePackage{eso-pic}
-%
-%% recover the error
-\ifnum\pxesop at status>\z@ % auto
- \def\pxesop at pkgtohook{eso-pic}%
- % note that ``plautopatch.sty'' discards the hook
- % on LaTeX2e 2020-02-02 PL5 or older
- \ifx\declare at file@substitution\@undefined
- \let\pxesop at pkgtohook\pxesop at pkgname
- % throw an error for unsupported usage
- % [FIXME] the error below is actually unnecessary when
- % none of ``eso-pic.sty'' options is used; how to detect that?
- \pxesop at error{Try loading \pxesop at pkgname\space by hand}\@ehc
- \fi
-\else
- \let\pxesop at pkgtohook\pxesop at pkgname
-\fi
-\pxesop at ExecuteAfterPackage\pxesop at pkgtohook{%
- \let\@unknownoptionerror\pxesop at unknownoptionerror
- \pxesop at debug{\noexpand\@unknownoptionerror restored}%
-}
-%%
-
-%% delayed to detect \iftombow status
-\AtBeginDocument{%
- \ifx\tombowtrue\@undefined
- \pxesop at warn{Tombow feature unavailable, aborting}%
- \fi
- \iftombow \pxesop at new \else \pxesop at orig \fi}%
-%
-%% for \iftombow is FALSE => restore from ``eso-pic.sty''
-\expandafter\def\expandafter\pxesop at orig\expandafter{%
- \expandafter\AtBeginShipout\expandafter{\pxesop at hook}}
-%
-%% for \iftombow is TRUE => redefine by ``pxesopic.sty''
-\def\pxesop at new{%
- %% \AtStockLowerLeft: based on TRUE of \ESO at isMEMOIR
- \renewcommand\AtStockLowerLeft[1]{%
- \begingroup
- \@tempdima=-\stockwidth
- \advance\@tempdima\paperwidth
- \@tempdimb=-\stockheight
- \advance\@tempdimb\paperheight
- %% specific BEGIN
- \advance\@tempdima 1in\relax
- \advance\@tempdimb 1in\relax
- %% specific END
- \AtPageLowerLeft{%
- \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){##1}%
- }%
- \endgroup
- }% ===
- %% \AtStockUpperLeft: based on TRUE of \ESO at isMEMOIR
- \renewcommand\AtStockUpperLeft[1]{%
- \AtStockLowerLeft{%
- \put(0,\LenToUnit{\stockheight}){##1}%
- }%
- }% ===
- %% \AtStockCenter: based on TRUE of \ESO at isMEMOIR
- \renewcommand\AtStockCenter[1]{%
- \AtStockLowerLeft{%
- \put(\LenToUnit{.5\stockwidth},\LenToUnit{.5\stockheight}){##1}%
- }%
- }%
- %% \AtTextUpperLeft: same as FALSE of \ESO at isMEMOIR
- % (no change)
- %
- %% \AtBeginShipout: based on TRUE of \ESO at isMEMOIR
- \AtBeginShipout{%
- \@tempdima=\dimexpr(\stockwidth-\paperwidth)/2\relax
- \@tempdimb=-\dimexpr(\stockheight+\paperheight)/2\relax
- \ifESO at texcoord
- \advance\@tempdimb\paperheight % [FIXME] not sure!
- \fi
- \nointerlineskip
- \AtBeginShipoutUpperLeft{%
- \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){%
- \ESO at HookIIIBG\ESO at HookIBG\ESO at HookIIBG
- \global\let\ESO at HookIIBG\@empty
- }%
- }%
- \AtBeginShipoutUpperLeftForeground{%
- \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){%
- \ESO at HookIFG\ESO at HookIIFG\ESO at HookIIIFG
- \global\let\ESO at HookIIFG\@empty
- }%
- }%
- }% ===
-}
-%%
-
-\endinput
-%% EOF
Deleted: trunk/Master/texmf-dist/tex/latex/plautopatch/pxpdfpages.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/plautopatch/pxpdfpages.sty 2020-10-14 21:42:05 UTC (rev 56656)
+++ trunk/Master/texmf-dist/tex/latex/plautopatch/pxpdfpages.sty 2020-10-14 21:43:07 UTC (rev 56657)
@@ -1,51 +0,0 @@
-%
-% pxpdfpages.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
-% * pdfpages.sty
-% (2015/07/19 v0.5a -- 2020/01/28 v0.5q)
-% * plcore.ltx in platex
-% (2001/09/26 v1.2a -- 2020/03/05 v1.3e)
-%
-
-%% package declaration
-\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxpdfpages}
- [2018/08/20 v0.1 Patch to pdfpages for (u)pLaTeX]
-
-%% preparations
-\def\pxpdpg at pkgname{pxpdfpages}
-\def\pxpdpg at warn{\PackageWarningNoLine\pxpdpg at pkgname}
-\def\pxpdpg at info{\PackageInfo\pxpdpg at pkgname}
-
-%% load it
-\RequirePackageWithOptions{pdfpages}
-\RequirePackage{pxatbegshi}% pdfpages requires atbegshi
-
-%% patch internal for pdfpages to work with tombow
-%% Note: this code should be copied to gentombow.sty!
-\def\pxpdpg at patch@pdfpages{%
- \RequirePackage{etoolbox}
- \patchcmd{\AM at output}{%
- \setlength{\@tempdima}{\AM at xmargin}%
- \edef\AM at xmargin{\the\@tempdima}%
- \setlength{\@tempdima}{\AM at ymargin}%
- \edef\AM at ymargin{\the\@tempdima}%
- }{%
- \setlength{\@tempdima}{\AM at xmargin\iftombow+1in\fi}%
- \edef\AM at xmargin{\the\@tempdima}%
- \setlength{\@tempdima}{\AM at ymargin\iftombow-1in\fi}%
- \edef\AM at ymargin{\the\@tempdima}%
- }
- {\pxpdpg at info{Patch for pdfpages applied}}
- {\pxpdpg at warn{Patch for pdfpages failed}}%
- }
-\AtBeginDocument{\@ifpackageloaded{pdfpages}{\pxpdpg at patch@pdfpages}{}}
-
-%% all done
-
-\endinput
Modified: trunk/Master/texmf-dist/tex/latex/plautopatch/pxpgfrcs.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/plautopatch/pxpgfrcs.sty 2020-10-14 21:42:05 UTC (rev 56656)
+++ trunk/Master/texmf-dist/tex/latex/plautopatch/pxpgfrcs.sty 2020-10-14 21:43:07 UTC (rev 56657)
@@ -9,8 +9,15 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{pxpgfrcs}
- [2018/09/21 v0.1 shadings etc in tate class]
-\RequirePackage{pgfrcs}
+ [2020/10/10 v0.2 shadings etc in tate class]
+\RequirePackage{pgfrcs}% pgfutil-latex.def requires everyshi
+\ifx\@EveryShipout at Output\@undefined
+ % LaTeX2e 2020-10-01: an emulation by ``everyshi-ltx.sty''
+ % => pLaTeX2e 2020-10-01 natively supports it
+\else
+ % older: the real ``everyshi.sty'' is loaded
+ \IfFileExists{pxeveryshi.sty}{\RequirePackage{pxeveryshi}}{}
+\fi
% Note: I chose the name "pxpgfrcs.sty"
% (instead of "pgfutil-platex.def") because
@@ -20,7 +27,6 @@
% such an interface like \input pgfutil-platex.def.
% patch pgfutil-latex.def
-\RequirePackage{pxeveryshi}% pgfutil-latex.def requires everyshi
\def\pgfutil at insertatbegincurrentpagefrombox#1{%
\edef\pgf at temp{\the\wd\pgfutil at abb}%
\global\setbox\pgfutil at abb\hbox{%
Deleted: trunk/Master/texmf-dist/tex/latex/plautopatch/pxtextpos.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/plautopatch/pxtextpos.sty 2020-10-14 21:42:05 UTC (rev 56656)
+++ trunk/Master/texmf-dist/tex/latex/plautopatch/pxtextpos.sty 2020-10-14 21:43:07 UTC (rev 56657)
@@ -1,85 +0,0 @@
-%
-% 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 tombow]
-
-%% preparations
-\def\pxtxtpos at pkgname{pxtextpos}
-\def\pxtxtpos at warn{\PackageWarningNoLine\pxtxtpos at pkgname}
-
-%% load it
-\RequirePackageWithOptions{textpos}
-
-%% check if \iftombow ... \fi is available
-\ifx\tombowtrue\@undefined
- \pxtxtpos at warn{Tombow feature unavailable, aborting}
- \expandafter\endinput
-\fi
-
-%% known definition
-\def\pxtxtpos at textblockorigin#1#2{%
- \ifTP at abspos
- \TP at ox=-1in \addtolength\TP at ox{#1}
- \TP at oy=-1in \addtolength\TP at oy{#2}
- \ifTP at 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 at textblockorigin
-
-%% redefine it
-\ifx\textblockorigin\pxtxtpos at textblockorigin\else
- \pxtxtpos at 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 at pkgname.sty'}
-\fi
-\def\textblockorigin#1#2{%
- \ifTP at abspos
- \TP at ox=-1in \addtolength\TP at ox{#1}
- \TP at oy=-1in \addtolength\TP at oy{#2}
- %%% addition
- \iftombow
- \addtolength\TP at ox{1in}\addtolength\TP at oy{1in}
- \fi
- %%%
- \ifTP at 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 at abspos
- \textblockorigin{0pt}{0pt}%
-\fi
-
-\endinput
-%% EOF
More information about the tex-live-commits
mailing list.