5 files changed, 14 insertions, 12 deletions
diff --git a/Master/texmf-dist/doc/latex/platex-tools/Makefile b/Master/texmf-dist/doc/latex/platex-tools/Makefile
index 7d251a3d134..f29bbf95216 100644
--- a/Master/texmf-dist/doc/latex/platex-tools/Makefile
+++ b/Master/texmf-dist/doc/latex/platex-tools/Makefile
@@ -7,7 +7,7 @@ all: plarray.pdf plextarray.pdf plextdelarray.pdf \
 	pxeverysel.pdf pxeveryshi.pdf
 
 .SUFFIXES: .tex .dvi .pdf
-.tex.dvi:
+%.dvi: %.tex %.sty
 	platex $(KANJI) $<
 	platex $(KANJI) $<
 	rm *.aux *.log
diff --git a/Master/texmf-dist/doc/latex/platex-tools/README.md b/Master/texmf-dist/doc/latex/platex-tools/README.md
index 632addc8a50..e88f159fb9c 100644
--- a/Master/texmf-dist/doc/latex/platex-tools/README.md
+++ b/Master/texmf-dist/doc/latex/platex-tools/README.md
@@ -74,6 +74,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
 
 ## Release Date
 
-2018-10-27
+2018-10-28
 
 Hironobu Yamashita
diff --git a/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.pdf b/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.pdf
index 2c9cea486f6..83ab40a82ed 100644
--- a/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.pdf
+++ b/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.pdf
diff --git a/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.tex b/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.tex
index ef209a03796..ab460879545 100644
--- a/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.tex
+++ b/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.tex
@@ -39,8 +39,8 @@ Martin Schr\"oder氏による\textsf{everysel}パッケージをp\LaTeX で
 使いかたは、\textsf{everysel}パッケージの代わりに、あるいは
 \textsf{everysel}パッケージに追加して、\textsf{pxeverysel}パッケージを
 読み込むだけです\footnote{稀に\\\texttt{%
-!\ Package pxeverysel Error:\ Patch too late!\\
-(pxeverysel)\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Load pxeverysel earlier.%
+!~Package pxeverysel Error:~Patch too late!\\
+(pxeverysel)~~~~~~~~~~~~~~~~Load pxeverysel earlier.%
 }\\というエラーが出ることがあります。この場合は、
 \textsf{pxeverysel}パッケージを少し早めに読み込んでみてください。}。
 \textsf{everysel}を内部で読み込んでいる\textsf{ragged2e}を例に示します：
diff --git a/Master/texmf-dist/tex/latex/platex-tools/pxeverysel.sty b/Master/texmf-dist/tex/latex/platex-tools/pxeverysel.sty
index 447f42876f2..5c00f1830f2 100644
--- a/Master/texmf-dist/tex/latex/platex-tools/pxeverysel.sty
+++ b/Master/texmf-dist/tex/latex/platex-tools/pxeverysel.sty
@@ -12,7 +12,7 @@
 %% package declaration
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pxeverysel}
-    [2018/10/27 v0.8 Patch to everysel for (u)pLaTeX]
+    [2018/10/28 v0.9 Patch to everysel for (u)pLaTeX]
 
 %% previous code for ctex support has been removed in v0.5,
 %% as ctex has depended on pxeverysel since 2016/12/27 v2.4.7
@@ -24,20 +24,18 @@
     \PackageError{pxeverysel}{%
       Patch too late!\MessageBreak
       Load pxeverysel earlier}\@ehc
+    \expandafter\endinput
+  \fi
 }{}
 
-%% preparations
-\def\pxys@pkgname{pxeverysel}
-\def\pxys@warn{\PackageWarningNoLine\pxys@pkgname}
-
 %% load it, but ensure that \@EverySelectfont@Init is not executed
 %  [Note] everysel.sty contains
 %    \AtBeginDocument{\@EverySelectfont@Init}
 %  at the end. In most cases, the execution is actually delayed;
 %  however,
-%    \AtBeginDocument{everysel} (e.g. found in sidecap.sty)
-%  can execute it immediately. In this case, delay it until the
-%  end of pxeverysel.sty.
+%    \AtBeginDocument{\RequirePackage{everysel}}
+%  can execute it immediately (e.g. found in sidecap.sty).
+%  In this case, delay it until the end of pxeverysel.sty.
 \ifx\AtBeginDocument\@firstofone
   \def\pxys@begindocumenthook{\let\AtBeginDocument\@firstofone}
   \def\AtBeginDocument{\g@addto@macro\pxys@begindocumenthook}
@@ -52,6 +50,10 @@
 
 %--------------------------------------- helpers
 
+%% preparations
+\def\pxys@pkgname{pxeverysel}
+\def\pxys@warn{\PackageWarningNoLine\pxys@pkgname}
+
 %% unique tokens
 \def\pxys@mark{\pxys@mark@}
 \def\pxys@fin{\pxys@fin@}