summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/platex-tools/LICENSE2
-rw-r--r--Master/texmf-dist/doc/latex/platex-tools/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.pdfbin70954 -> 83094 bytes
-rw-r--r--Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.tex23
-rw-r--r--Master/texmf-dist/doc/latex/platex-tools/pxeveryshi.pdfbin44094 -> 57534 bytes
-rw-r--r--Master/texmf-dist/doc/latex/platex-tools/pxeveryshi.tex11
-rw-r--r--Master/texmf-dist/doc/latex/platex-tools/pxxspace.pdfbin40065 -> 39968 bytes
-rw-r--r--Master/texmf-dist/tex/latex/platex-tools/plarray.sty4
-rw-r--r--Master/texmf-dist/tex/latex/platex-tools/plextarray.sty4
-rw-r--r--Master/texmf-dist/tex/latex/platex-tools/plextdelarray.sty2
-rw-r--r--Master/texmf-dist/tex/latex/platex-tools/pxatbegshi.sty26
-rw-r--r--Master/texmf-dist/tex/latex/platex-tools/pxeveryshi.sty29
-rw-r--r--Master/texmf-dist/tex/latex/platex-tools/pxmulticol.sty2
-rw-r--r--Master/texmf-dist/tex/latex/platex-tools/pxxspace.sty4
14 files changed, 86 insertions, 23 deletions
diff --git a/Master/texmf-dist/doc/latex/platex-tools/LICENSE b/Master/texmf-dist/doc/latex/platex-tools/LICENSE
index c463b620a91..9661ce7b8d1 100644
--- a/Master/texmf-dist/doc/latex/platex-tools/LICENSE
+++ b/Master/texmf-dist/doc/latex/platex-tools/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2016-2019 Hironobu Yamashita
+Copyright (c) 2016-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/platex-tools/README.md b/Master/texmf-dist/doc/latex/platex-tools/README.md
index 72fb0632cbb..903bb76ee3e 100644
--- a/Master/texmf-dist/doc/latex/platex-tools/README.md
+++ b/Master/texmf-dist/doc/latex/platex-tools/README.md
@@ -83,6 +83,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
## Release Date
-2019-09-07
+2020-09-27
Hironobu Yamashita
diff --git a/Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.pdf b/Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.pdf
index 68527a8a2c9..6401ed5cf8e 100644
--- a/Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.pdf
+++ b/Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.tex b/Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.tex
index 35c6fd413af..e3d34cda14a 100644
--- a/Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.tex
+++ b/Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.tex
@@ -25,6 +25,10 @@ with Japanese classes for vertical writing (tarticle.cls, etc).
The package \textsf{pxatbegshi} provides a patch for \textsf{atbegshi}
to work with both horizontal and vertical writing.
+With \pLaTeXe~2020-10-01 or later, this package does
+nothing because the \pLaTeXe\ itself handles the situation.
+Therefore, you will not need this package at all.
+
This package is part of \textsf{platex-tools} bundle:
\begin{verbatim}
https://github.com/aminophen/platex-tools
@@ -40,7 +44,18 @@ p\LaTeX の縦組クラス(tarticle.clsなど)で使うとエラーが出て
この\textsf{pxatbegshi}パッケージは、縦組クラスでも
\textsf{atbegshi}パッケージの機能を使えるようにするためのものです。
もちろん、横組クラスで\textsf{pxatbegshi}パッケージを使用しても
-問題は起きません。
+ほぼ問題は起きません。ただし、制約事項として
+\begin{quote}
+「\verb+\AtBeginShipout+の中身が外部垂直モードで実行されること」を
+想定した使用は\emph{サポートしない}
+\end{quote}
+と明言します(例:\verb+aminophen/platex-tools#15+)。
+
+\pLaTeXe~2020-10-01以降では、同等の機能が\pLaTeXe{}カーネルに
+存在するため、\textsf{pxatbegshi}パッケージは何もしません。
+
+\newpage
+\section{使いかた}
使いかたは、\textsf{atbegshi}パッケージの代わりに、あるいは
\textsf{atbegshi}パッケージに追加して、\textsf{pxatbegshi}パッケージを
@@ -58,12 +73,12 @@ p\LaTeX の縦組クラス(tarticle.clsなど)で使うとエラーが出て
\end{document}
\end{verbatim}
-\section*{謝辞}
+\section{謝辞}
-本パッケージの実装は、北川さん(Hironori Kitagawa)さんによる
+本パッケージの実装は、北川さん(Hironori Kitagawa)による
「\verb+\AtBegShi@Output+の処理を強引に横組でやらせるコード」
をベースにしています\footnote{2018/09/21 v0.4では
-Takayuki Yato (ZR) 氏による\textsf{bxpapersize}パッケージを参考に
+Takayuki Yato (ZR) さんによる\textsf{bxpapersize}パッケージを参考に
していましたが、\textsf{multicol}パッケージで問題が起きるようなので
v0.3以前と同様に北川さんのコードベースに戻しました。}。
diff --git a/Master/texmf-dist/doc/latex/platex-tools/pxeveryshi.pdf b/Master/texmf-dist/doc/latex/platex-tools/pxeveryshi.pdf
index b9b989d393a..d4538ba42c8 100644
--- a/Master/texmf-dist/doc/latex/platex-tools/pxeveryshi.pdf
+++ b/Master/texmf-dist/doc/latex/platex-tools/pxeveryshi.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/platex-tools/pxeveryshi.tex b/Master/texmf-dist/doc/latex/platex-tools/pxeveryshi.tex
index b5e612ba51f..598fba6a5b8 100644
--- a/Master/texmf-dist/doc/latex/platex-tools/pxeveryshi.tex
+++ b/Master/texmf-dist/doc/latex/platex-tools/pxeveryshi.tex
@@ -8,7 +8,7 @@
\usepackage{pxeveryshi}
\GetFileInfo{pxeveryshi.sty}
\title{Package \textsf{pxeveryshi} \fileversion}
-\author{Takayuki Yato}
+\author{Takayuki Yato \& Hironobu Yamashita}
\date{\filedate}
\begin{document}
@@ -25,6 +25,10 @@ cannot be used with Japanese classes for vertical writing
The package \textsf{pxeveryshi} provides a patch for \textsf{everyshi}
to work with both horizontal and vertical writing.
+With \pLaTeXe~2020-10-01 or later, this package does
+nothing because the \pLaTeXe\ itself handles the situation.
+Therefore, you will not need this package at all.
+
This package is part of \textsf{platex-tools} bundle:
\begin{verbatim}
https://github.com/aminophen/platex-tools
@@ -40,6 +44,11 @@ p\LaTeX の縦組クラス(tarticle.clsなど)で使うとエラーが出て
\textsf{everyshi}パッケージ(およびこれに依存するパッケージ)が
使えるようになります。
+\pLaTeXe~2020-10-01以降では、同等の機能が\pLaTeXe{}カーネルに
+存在するため、\textsf{pxeveryshi}パッケージは何もしません。
+
+\section{使いかた}
+
使いかたは、\textsf{everyshi}パッケージの代わりに、あるいは
\textsf{everyshi}パッケージに追加して、\textsf{pxeveryshi}パッケージを
読みこむだけです。使用例:
diff --git a/Master/texmf-dist/doc/latex/platex-tools/pxxspace.pdf b/Master/texmf-dist/doc/latex/platex-tools/pxxspace.pdf
index 2aa3d488310..8dc7a2a4a8d 100644
--- a/Master/texmf-dist/doc/latex/platex-tools/pxxspace.pdf
+++ b/Master/texmf-dist/doc/latex/platex-tools/pxxspace.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/platex-tools/plarray.sty b/Master/texmf-dist/tex/latex/platex-tools/plarray.sty
index 8c797ef59ce..52ff536d540 100644
--- a/Master/texmf-dist/tex/latex/platex-tools/plarray.sty
+++ b/Master/texmf-dist/tex/latex/platex-tools/plarray.sty
@@ -7,9 +7,9 @@
%
% This package is expected to be compatible with
% * array.sty in latex-tools
-% (2016/10/06 v2.4d -- 2018/11/13 v2.4j)
+% (2016/10/06 v2.4d -- 2019/08/31 v2.4l)
% * plcore.ltx in platex
-% (2001/09/26 v1.2a -- 2018/09/02 v1.3)
+% (2001/09/26 v1.2a -- 2020/03/05 v1.3e)
%
\NeedsTeXFormat{pLaTeX2e}
diff --git a/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty b/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty
index 1e706d9a75d..a1f38056782 100644
--- a/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty
+++ b/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty
@@ -7,9 +7,9 @@
%
% This package is expected to be compatible with
% * array.sty in latex-tools
-% (2016/10/06 v2.4d -- 2018/11/13 v2.4j)
+% (2016/10/06 v2.4d -- 2019/08/31 v2.4l)
% * plext.sty in platex
-% (2001/09/26 v1.2 -- 2018/10/07 v1.2k)
+% (2001/09/26 v1.2 -- 2019/09/29 v1.2l)
% Largely based on lltjext.sty from LuaTeX-ja project.
%
diff --git a/Master/texmf-dist/tex/latex/platex-tools/plextdelarray.sty b/Master/texmf-dist/tex/latex/platex-tools/plextdelarray.sty
index 1c6b097c2c9..03008c193e6 100644
--- a/Master/texmf-dist/tex/latex/platex-tools/plextdelarray.sty
+++ b/Master/texmf-dist/tex/latex/platex-tools/plextdelarray.sty
@@ -9,7 +9,7 @@
% * delarray.sty in latex-tools
% (2014/10/28 v1.01)
% * plext.sty in platex
-% (2001/09/26 v1.2 -- 2018/10/07 v1.2k)
+% (2001/09/26 v1.2 -- 2019/09/29 v1.2l)
%
\NeedsTeXFormat{pLaTeX2e}
diff --git a/Master/texmf-dist/tex/latex/platex-tools/pxatbegshi.sty b/Master/texmf-dist/tex/latex/platex-tools/pxatbegshi.sty
index bbe8c49ac3f..3c8a8304154 100644
--- a/Master/texmf-dist/tex/latex/platex-tools/pxatbegshi.sty
+++ b/Master/texmf-dist/tex/latex/platex-tools/pxatbegshi.sty
@@ -18,13 +18,19 @@
% the original code (2018/09/21 v0.3), which was largely based on
% H. Kitagawa's on GitHub:texjporg/tex-jp-build#21.
% -- concept: execute all hooks inside yoko direction \vbox
-% --------------------------------------------------
+%
+% Update: version 2020/09/09 v0.6 supports LaTeX2e 2020-10-01
+% based on a method proposed by H. Kitagawa in lltjp-atbegshi.sty.
+%
+% Update: version 2020/09/25 v0.7 does nothing, since
+% pLaTeX2e 2020-10-01 will support the situation natively.
+% --------------------------------------------------------------------
%
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{pxatbegshi}
- [2019/09/07 v0.5 Patch to atbegshi for (u)pLaTeX]
+ [2020/09/25 v0.7 Patch to atbegshi for (u)pLaTeX]
%% preparations
\def\pxabgs@pkgname{pxatbegshi}
@@ -33,6 +39,20 @@
%% load it
\RequirePackage{atbegshi}
+%% Since LaTeX2e 2020-10-01, atbegshi.sty is merely
+%% an emulation by atbegshi-ltx.sty from ltshipout.dtx.
+%% The new code does NOT define \AtBegShi@Output,
+%% so we can detect it!
+
+\ifx\AtBegShi@Output\@undefined
+ %% pLaTeX2e 2020-10-01 natively supports the situation
+ \PackageInfo{pxatbegshi}{This package is no longer needed}
+ \expandafter\endinput
+\fi
+
+%% The rest of this package is meant for
+%% LaTeX2e 2020-02-02 PL5 or older.
+
%% internal macros are locally effective
\begingroup
@@ -56,8 +76,6 @@
%---------------------------------------
-% concept: execute all hooks inside yoko direction \vbox
-
% prepare
\let\pxabgs@AtBegShi@Output\AtBegShi@Output
% try first patch
diff --git a/Master/texmf-dist/tex/latex/platex-tools/pxeveryshi.sty b/Master/texmf-dist/tex/latex/platex-tools/pxeveryshi.sty
index 8a534095d96..23bbd8abe0e 100644
--- a/Master/texmf-dist/tex/latex/platex-tools/pxeveryshi.sty
+++ b/Master/texmf-dist/tex/latex/platex-tools/pxeveryshi.sty
@@ -1,18 +1,39 @@
%
% pxeveryshi.sty
-% written by Takayuki Yato (ZR)
+% originally written by Takayuki Yato (ZR)
+% and modified by Hironobu Yamashita
%
% This package is distributed as part of the platex-tools bundle
% maintained by Hironobu Yamashita
% by courtesy of the original author.
% https://github.com/aminophen/platex-tools
%
+% --------------------------------------------------------------------
+% [Note]
+% Update: version 2020/09/25 v0.2 does nothing, since
+% pLaTeX2e 2020-10-01 will support the situation natively.
+% --------------------------------------------------------------------
+%
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{pxeveryshi}
- [2012/05/19 v0.1 everyshi package for pLaTeX]
+ [2020/09/25 v0.2 everyshi package for pLaTeX]
\RequirePackageWithOptions{everyshi}
-%
+
+%% Since LaTeX2e 2020-10-01, everyshi.sty is merely
+%% an emulation by everyshi-ltx.sty from ltshipout.dtx.
+%% The new code does NOT define \@EveryShipout@Output,
+%% so we can detect it!
+
+\ifx\@EveryShipout@Output\@undefined
+ %% pLaTeX2e 2020-10-01 natively supports the situation
+ \PackageInfo{pxeveryshi}{This package is no longer needed}
+ \expandafter\endinput
+\fi
+
+%% The rest of this package is meant for
+%% LaTeX2e 2020-02-02 PL5 or older.
+
\def\@EveryShipout@Output{%
\setbox8\vbox{%
\yoko
@@ -23,6 +44,6 @@
\gdef\@EveryShipout@AtNextHook{}%
\@EveryShipout@Org@Shipout\box\@cclv
}
-%
+
\endinput
%% EOF
diff --git a/Master/texmf-dist/tex/latex/platex-tools/pxmulticol.sty b/Master/texmf-dist/tex/latex/platex-tools/pxmulticol.sty
index 63274eb94e4..2b0c3af4ddd 100644
--- a/Master/texmf-dist/tex/latex/platex-tools/pxmulticol.sty
+++ b/Master/texmf-dist/tex/latex/platex-tools/pxmulticol.sty
@@ -7,7 +7,7 @@
%
% This package is expected to be compatible with
% * multicol.sty in latex-tools
-% (1995/10/19 v1.5l -- 2018/04/01 v1.8r)
+% (1995/10/19 v1.5l -- 2019/12/09 v1.8y)
%
\NeedsTeXFormat{pLaTeX2e}
diff --git a/Master/texmf-dist/tex/latex/platex-tools/pxxspace.sty b/Master/texmf-dist/tex/latex/platex-tools/pxxspace.sty
index 1a8207536c2..384a157be62 100644
--- a/Master/texmf-dist/tex/latex/platex-tools/pxxspace.sty
+++ b/Master/texmf-dist/tex/latex/platex-tools/pxxspace.sty
@@ -24,14 +24,14 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{pxxspace}
- [2019/04/30 v0.2 Patch for xspace for pLaTeX/upLaTeX]
+ [2019/09/23 v0.2a Patch for xspace for pLaTeX/upLaTeX]
\def\pxxs@pkgname{pxxspace}
%--------------------------------------- preparations
%% e-TeX is required
\RequirePackage{etoolbox}[2011/01/03]% v2.1
-\ifx\numdef\@undefined \endinput \fi
+\ifx\numdef\@undefined \expandafter\endinput \fi
%% packages
\RequirePackage{xspace}[2009/10/20]% v1.13