bxcalc (28jan18)

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

3 files changed, 31 insertions, 6 deletions

diff --git a/Master/texmf-dist/tex/latex/bxcalc/bxcalc.sty b/Master/texmf-dist/tex/latex/bxcalc/bxcalc.sty
index 9c8fe9c59ed..4dccf4bd603 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) 2017 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2018 Takayuki YATO (aka. "ZR")
 %%   GitHub:   https://github.com/zr-tex8r
 %%   Twitter:  @zr_tex8r
 %%
@@ -10,7 +10,7 @@
 
 %% package declaration
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bxcalc}[2017/05/21 v1.0]
+\ProvidesPackage{bxcalc}[2018/01/28 v1.0a]
 \def\bxqcz@pkgname{bxcalc}
 
 %--------------------------------------- main
@@ -20,6 +20,30 @@
 \RequirePackage{bxcalcize}[2017/05/21]% v1.0
 \RequirePackage{bxcalcux}[2017/05/21]% v1.0
 
+%--------------------------------------- \usepTeXunits
+
+\ifundef{\kanjiskip}{%
+  \newrobustcmd*{\usepTeXunits}{%
+    \DeclareCalcUnit{Q}{\dimexpr0.25mm\relax}%
+    \DeclareCalcUnit{H}{\dimexpr0.25mm\relax}%
+    \DeclareCalcUnit{trueQ}{\dimexpr0.25truemm\relax}%
+    \DeclareCalcUnit{trueH}{\dimexpr0.25truemm\relax}%
+    \ifdef{\zw}{%
+      \DeclareCalcUnit{zw}{\zw}%%
+      \DeclareCalcUnit{zh}{\zw}%
+    }{\ifdef{\jsZw}{%
+      \DeclareCalcUnit{zw}{\jsZw}%%
+      \DeclareCalcUnit{zh}{\jsZw}%
+    }{}}%
+    \ifdef{\zh}{%
+      \DeclareCalcUnit{zh}{\zh}%
+    }{}%
+    \let\usepTeXunits\relax
+  }%
+}{%else
+  \newrobustcmd*{\usepTeXunits}{}%
+}
+
 %--------------------------------------- all done
 \endinput
 %% EOF
diff --git a/Master/texmf-dist/tex/latex/bxcalc/bxcalcize.sty b/Master/texmf-dist/tex/latex/bxcalc/bxcalcize.sty
index 1c913e53e2c..33342f7cc92 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) 2017 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2018 Takayuki YATO (aka. "ZR")
 %%   GitHub:   https://github.com/zr-tex8r
 %%   Twitter:  @zr_tex8r
 %%
@@ -10,7 +10,7 @@
 
 %% package declaration
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bxcalcize}[2017/05/21 v1.0]
+\ProvidesPackage{bxcalcize}[2018/01/28 v1.0a]
 \def\bxcy@pkgname{bxcalcize}
 
 %% code guards
diff --git a/Master/texmf-dist/tex/latex/bxcalc/bxcalcux.sty b/Master/texmf-dist/tex/latex/bxcalc/bxcalcux.sty
index 6f7eb323d15..489d376a897 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) 2017 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2018 Takayuki YATO (aka. "ZR")
 %%   GitHub:   https://github.com/zr-tex8r
 %%   Twitter:  @zr_tex8r
 %%
@@ -10,7 +10,7 @@
 
 %% package declaration
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bxcalcux}[2017/05/21 v1.0]
+\ProvidesPackage{bxcalcux}[2018/01/28 v1.0a]
 \def\bxcx@pkgname{bxcalcux}
 
 %% code guards
@@ -56,6 +56,7 @@
 %% Makes the array \bxcx@arity*.
 \csdef{bxcx@arity\string\minof}{2}
 \csdef{bxcx@arity\string\maxof}{2}
+\csdef{bxcx@arity\string\ratio}{2}
 
 %% Makes the array \bxcx@lc/*.
 \@tempcnta=65