bxcalc (25sep20)

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

9 files changed, 42 insertions, 11 deletions

diff --git a/Master/texmf-dist/doc/latex/bxcalc/README-ja.md b/Master/texmf-dist/doc/latex/bxcalc/README-ja.md
index ed83dd60910..a7df704b32c 100644
--- a/Master/texmf-dist/doc/latex/bxcalc/README-ja.md
+++ b/Master/texmf-dist/doc/latex/bxcalc/README-ja.md
@@ -51,6 +51,9 @@ bxcalcux パッケージ ― 新しい長さ単位の追加
 更新履歴
 --------
 
+  * Version 1.1  〈2020/09/25〉
+      - LaTeX カーネル 2020/10/01 版への対応。
+
   * Version 1.0b 〈2019/11/24〉
       - バグ修正。
 
diff --git a/Master/texmf-dist/doc/latex/bxcalc/README.md b/Master/texmf-dist/doc/latex/bxcalc/README.md
index 7819e5c1ebe..d260021cb78 100644
--- a/Master/texmf-dist/doc/latex/bxcalc/README.md
+++ b/Master/texmf-dist/doc/latex/bxcalc/README.md
@@ -33,6 +33,10 @@ bxcalc package ― main
 
 This package simply loads all other packages in this bundle.
 
+Note: Under the LaTeX kernel of the version 2020/10/01 or later, the
+bxcalcize package is not loaded since it is no longer needed.
+
+
 bxcalcize package ― to make calc expressions available in more places
 ----------------------------------------------------------------------
 
@@ -41,6 +45,10 @@ the use of calc expressions. This package makes such uses possible.
 
 See the manual bxcalcize.pdf for detail.
 
+Note: The functionality of this package will be provided by the LaTeX
+kernel of the version 2020/10/01.
+
+
 bxcalcux package ― to add user-defined units to the calc syntax
 ----------------------------------------------------------------
 
@@ -49,9 +57,13 @@ calc expressions.
 
 See the manual bxcalcux.pdf for detail.
 
+
 Revision History
 ----------------
 
+  * Version 1.1  〈2020/09/25〉
+      - Support LaTeX kernel 2020/10/01.
+
   * Version 1.0b 〈2019/11/24〉
       - Bug fix.
 
diff --git a/Master/texmf-dist/doc/latex/bxcalc/bxcalcize.pdf b/Master/texmf-dist/doc/latex/bxcalc/bxcalcize.pdf
index cc15e7cb16a..23fe3879ef3 100644
--- a/Master/texmf-dist/doc/latex/bxcalc/bxcalcize.pdf
+++ b/Master/texmf-dist/doc/latex/bxcalc/bxcalcize.pdf
diff --git a/Master/texmf-dist/doc/latex/bxcalc/bxcalcize.tex b/Master/texmf-dist/doc/latex/bxcalc/bxcalcize.tex
index d4663a7b66c..5645aa9b06f 100644
--- a/Master/texmf-dist/doc/latex/bxcalc/bxcalcize.tex
+++ b/Master/texmf-dist/doc/latex/bxcalc/bxcalcize.tex
@@ -2,8 +2,8 @@
 \usepackage[scale=0.75]{geometry}
 \usepackage{shortvrb}
 \MakeShortVerb{\|}
-\newcommand{\PkgVersion}{1.0b}
-\newcommand{\PkgDate}{2019/11/24}
+\newcommand{\PkgVersion}{1.1}
+\newcommand{\PkgDate}{2020/09/25}
 \newcommand{\Pkg}[1]{\textsf{#1}}
 \newcommand{\Meta}[1]{$\langle$\textit{#1}$\rangle$}
 \newcommand{\Note}{\par\noindent \textbf{NB:}\quad}
@@ -17,6 +17,12 @@
 \maketitle
 
 %===========================================================
+\section{Notice}
+
+Functionality of this package will be provided by the LaTeX
+kernel of the version 2020/10/01.
+
+%===========================================================
 \section{Overview}
 
 After loading \Pkg{calc}, most of the length specifications
diff --git a/Master/texmf-dist/doc/latex/bxcalc/bxcalcux.pdf b/Master/texmf-dist/doc/latex/bxcalc/bxcalcux.pdf
index 61ff9003b25..fa530e451f3 100644
--- a/Master/texmf-dist/doc/latex/bxcalc/bxcalcux.pdf
+++ b/Master/texmf-dist/doc/latex/bxcalc/bxcalcux.pdf
diff --git a/Master/texmf-dist/doc/latex/bxcalc/bxcalcux.tex b/Master/texmf-dist/doc/latex/bxcalc/bxcalcux.tex
index 4f6ca48b414..2dd90a17c38 100644
--- a/Master/texmf-dist/doc/latex/bxcalc/bxcalcux.tex
+++ b/Master/texmf-dist/doc/latex/bxcalc/bxcalcux.tex
@@ -2,8 +2,8 @@
 \usepackage[scale=0.75]{geometry}
 \usepackage{shortvrb}
 \MakeShortVerb{\|}
-\newcommand{\PkgVersion}{1.0b}
-\newcommand{\PkgDate}{2019/11/24}
+\newcommand{\PkgVersion}{1.1}
+\newcommand{\PkgDate}{2020/09/25}
 \newcommand{\Pkg}[1]{\textsf{#1}}
 \newcommand{\Meta}[1]{$\langle$\textit{#1}$\rangle$}
 \newcommand{\Note}{\par\noindent \textbf{NB:}\quad}
diff --git a/Master/texmf-dist/tex/latex/bxcalc/bxcalc.sty b/Master/texmf-dist/tex/latex/bxcalc/bxcalc.sty
index d71eb2a3613..3336088f5b6 100644
--- a/Master/texmf-dist/tex/latex/bxcalc/bxcalc.sty
+++ b/Master/texmf-dist/tex/latex/bxcalc/bxcalc.sty
@@ -1,7 +1,7 @@
 %%
 %% This is file 'bxcalc.sty'.
 %% 
-%% Copyright (c) 2018-2019 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2018-2020 Takayuki YATO (aka. "ZR")
 %%   GitHub:   https://github.com/zr-tex8r
 %%   Twitter:  @zr_tex8r
 %%
@@ -10,14 +10,16 @@
 
 %% package declaration
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bxcalc}[2019/11/24 v1.0b]
+\ProvidesPackage{bxcalc}[2020/09/25 v1.1]
 \def\bxqcz@pkgname{bxcalc}
 
 %--------------------------------------- main
 
 %% packages
 \RequirePackage{calc}[]
-\RequirePackage{bxcalcize}[2017/05/21]% v1.0
+\@ifl@t@r\fmtversion{2020/10/01}{}{%else
+  \RequirePackage{bxcalcize}[2017/05/21]% v1.0
+}
 \RequirePackage{bxcalcux}[2017/05/21]% v1.0
 
 %--------------------------------------- \usepTeXunits
diff --git a/Master/texmf-dist/tex/latex/bxcalc/bxcalcize.sty b/Master/texmf-dist/tex/latex/bxcalc/bxcalcize.sty
index f469cd4ab9c..ebb119ae012 100644
--- a/Master/texmf-dist/tex/latex/bxcalc/bxcalcize.sty
+++ b/Master/texmf-dist/tex/latex/bxcalc/bxcalcize.sty
@@ -1,7 +1,7 @@
 %%
 %% This is file 'bxcalcize.sty'.
 %% 
-%% Copyright (c) 2018-2019 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2018-2020 Takayuki YATO (aka. "ZR")
 %%   GitHub:   https://github.com/zr-tex8r
 %%   Twitter:  @zr_tex8r
 %%
@@ -10,7 +10,7 @@
 
 %% package declaration
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bxcalcize}[2019/11/24 v1.0b]
+\ProvidesPackage{bxcalcize}[2020/09/25 v1.1]
 \def\bxcy@pkgname{bxcalcize}
 
 %% code guards
@@ -36,6 +36,14 @@
 \RequirePackage{etoolbox}[]
 \ifx\numdef\@undefined\endinput\fi
 
+% check kernel version
+\@ifl@t@r\fmtversion{2020/10/01}{%
+  \PackageWarningNoLine\bxcy@pkgname
+   {Functionality of this package is already\MessageBreak
+    provided by LaTeX}%
+  \endinput
+}{}
+
 %% variables
 \newdimen\bxcy@resdim
 
diff --git a/Master/texmf-dist/tex/latex/bxcalc/bxcalcux.sty b/Master/texmf-dist/tex/latex/bxcalc/bxcalcux.sty
index 9c55a6f7812..90e222643a7 100644
--- a/Master/texmf-dist/tex/latex/bxcalc/bxcalcux.sty
+++ b/Master/texmf-dist/tex/latex/bxcalc/bxcalcux.sty
@@ -1,7 +1,7 @@
 %%
 %% This is file 'bxcalcux.sty'.
 %% 
-%% Copyright (c) 2018-2019 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2018-2020 Takayuki YATO (aka. "ZR")
 %%   GitHub:   https://github.com/zr-tex8r
 %%   Twitter:  @zr_tex8r
 %%
@@ -10,7 +10,7 @@
 
 %% package declaration
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bxcalcux}[2019/11/24 v1.0b]
+\ProvidesPackage{bxcalcux}[2020/09/25 v1.1]
 \def\bxcx@pkgname{bxcalcux}
 
 %% code guards