uplatex (31mar18)

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

5 files changed, 13 insertions, 11 deletions

diff --git a/Master/texmf-dist/doc/uplatex/base/LICENSE b/Master/texmf-dist/doc/uplatex/base/LICENSE
index 00a8d34bb1c..aaca707a8ea 100644
--- a/Master/texmf-dist/doc/uplatex/base/LICENSE
+++ b/Master/texmf-dist/doc/uplatex/base/LICENSE
@@ -13,9 +13,9 @@ modification, are permitted provided that the following conditions are met:
   this list of conditions and the following disclaimer in the documentation
   and/or other materials provided with the distribution.
 
-* Neither the name of uplatex nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
+* Neither the name of the copyright holder nor the names of its contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
diff --git a/Master/texmf-dist/doc/uplatex/base/README.md b/Master/texmf-dist/doc/uplatex/base/README.md
index a4f54b4caf9..fde17fc40c0 100644
--- a/Master/texmf-dist/doc/uplatex/base/README.md
+++ b/Master/texmf-dist/doc/uplatex/base/README.md
@@ -17,6 +17,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
 
 ## Release Date
 
-2018-03-09
+2018-03-31
 
 Japanese TeX Development Community
diff --git a/Master/texmf-dist/doc/uplatex/base/upldoc.pdf b/Master/texmf-dist/doc/uplatex/base/upldoc.pdf
index 94f2a85530e..fc6579b9535 100644
--- a/Master/texmf-dist/doc/uplatex/base/upldoc.pdf
+++ b/Master/texmf-dist/doc/uplatex/base/upldoc.pdf
diff --git a/Master/texmf-dist/source/uplatex/base/uplvers.dtx b/Master/texmf-dist/source/uplatex/base/uplvers.dtx
index fb76fb53c90..97f3182f35b 100644
--- a/Master/texmf-dist/source/uplatex/base/uplvers.dtx
+++ b/Master/texmf-dist/source/uplatex/base/uplvers.dtx
@@ -47,12 +47,13 @@
 %    up\LaTeX{}のバージョンと最小限の変更だけを定義するようにした}
 % \changes{v1.1h-u02}{2018/02/18}{p\LaTeX{}の変更に追随。
 %     (based on plvers.dtx 2018/01/10 v1.1h)}
+% \changes{v1.1i-u02}{2018/03/31}{p\LaTeXe\ 2018/03/09以降必須}
 % \fi
 %
 % \iffalse
 %<*driver>
 % \fi
-\ProvidesFile{uplvers.dtx}[2018/02/18 v1.1h-u02 upLaTeX Kernel (Version Info)]
+\ProvidesFile{uplvers.dtx}[2018/03/31 v1.1i-u02 upLaTeX Kernel (Version Info)]
 % \iffalse
 \documentclass{jltxdoc}
 \GetFileInfo{uplvers.dtx}
@@ -79,22 +80,23 @@
 %    up\LaTeX{}のバージョンと最小限の変更だけを定義するようにした}
 %
 % まず、次のバージョンのp\LaTeX{}が利用可能なことを確認します。
+% \changes{v1.1i-u02}{2018/03/31}{p\LaTeXe\ 2018/03/09以降必須}
 %    \begin{macrocode}
 %<*plcore>
 \ifx\pfmtversion\@undefined
     \errhelp{Please update your TeX installation; if not available,
              obtain it^^Jmanually from CTAN
-             (https://www.ctan.org/pkg/uplatex) or from^^JGitHub
+             (https://ctan.org/pkg/uplatex) or from^^JGitHub
              (https://github.com/texjporg/uplatex).}%
     \errmessage{This should not happen!^^JThere should be some
                 inconsistency in your installation;^^Jtry
                 removing old `uplatex.ltx' and install the
                 latest one}\@@end
 \else
-  \ifnum\expandafter\@parse@version\pfmtversion\@nil<20180309
+  \ifnum\expandafter\@parse@version\pfmtversion//00\@nil<20180309
     \errhelp{Please update your TeX installation; if not available,
              obtain it^^Jmanually from CTAN
-             (https://www.ctan.org/pkg/platex) or from^^JGitHub
+             (https://ctan.org/pkg/platex) or from^^JGitHub
              (https://github.com/texjporg/platex).}%
     \errmessage{This version of upLaTeX2e requires pLaTeX2e 2018/03/09
                 or newer!^^JObtain a newer version of `platex',
diff --git a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
index bb02f4fa091..18e5e94a2fa 100644
--- a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
+++ b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
@@ -18,17 +18,17 @@
 \ifx\pfmtversion\@undefined
     \errhelp{Please update your TeX installation; if not available,
              obtain it^^Jmanually from CTAN
-             (https://www.ctan.org/pkg/uplatex) or from^^JGitHub
+             (https://ctan.org/pkg/uplatex) or from^^JGitHub
              (https://github.com/texjporg/uplatex).}%
     \errmessage{This should not happen!^^JThere should be some
                 inconsistency in your installation;^^Jtry
                 removing old `uplatex.ltx' and install the
                 latest one}\@@end
 \else
-  \ifnum\expandafter\@parse@version\pfmtversion\@nil<20180309
+  \ifnum\expandafter\@parse@version\pfmtversion//00\@nil<20180309
     \errhelp{Please update your TeX installation; if not available,
              obtain it^^Jmanually from CTAN
-             (https://www.ctan.org/pkg/platex) or from^^JGitHub
+             (https://ctan.org/pkg/platex) or from^^JGitHub
              (https://github.com/texjporg/platex).}%
     \errmessage{This version of upLaTeX2e requires pLaTeX2e 2018/03/09
                 or newer!^^JObtain a newer version of `platex',