10 files changed, 43 insertions, 11 deletions
diff --git a/Master/texmf-dist/doc/latex/bxcalc/LICENSE b/Master/texmf-dist/doc/latex/bxcalc/LICENSE
index 8ada757fbc8..fbe40a0146b 100644
--- a/Master/texmf-dist/doc/latex/bxcalc/LICENSE
+++ b/Master/texmf-dist/doc/latex/bxcalc/LICENSE
@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2017 Takayuki YATO (aka. "ZR")
+Copyright (c) 2018 Takayuki YATO (aka. "ZR")
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Master/texmf-dist/doc/latex/bxcalc/README-ja.md b/Master/texmf-dist/doc/latex/bxcalc/README-ja.md
index 66c8d4dceea..3c3395a57ca 100644
--- a/Master/texmf-dist/doc/latex/bxcalc/README-ja.md
+++ b/Master/texmf-dist/doc/latex/bxcalc/README-ja.md
@@ -51,6 +51,10 @@ bxcalcux パッケージ ― 新しい長さ単位の追加
 更新履歴
 --------
 
+  * Version 1.0a 〈2018/01/28〉
+      - (試験的) `\usepTeXunits` 命令を追加。
+      - バグ修正。
+
   * Version 1.0  〈2017/05/21〉
       - 本バンドルとしての最初の公開版。（元々は BXjatool の一部だった。）
 
diff --git a/Master/texmf-dist/doc/latex/bxcalc/README.md b/Master/texmf-dist/doc/latex/bxcalc/README.md
index 5f2993abb43..19ede34ea6a 100644
--- a/Master/texmf-dist/doc/latex/bxcalc/README.md
+++ b/Master/texmf-dist/doc/latex/bxcalc/README.md
@@ -52,6 +52,9 @@ See the manual bxcalcux.pdf for detail.
 Revision History
 ----------------
 
+  * Version 1.0a 〈2018/01/28〉
+      - Bug fix.
+
   * Version 1.0  〈2017/05/21〉
       - The first public version as this bundle, which has been seperated
         from the old BXjatool bundle.
diff --git a/Master/texmf-dist/doc/latex/bxcalc/bxcalcize.pdf b/Master/texmf-dist/doc/latex/bxcalc/bxcalcize.pdf
index 45f50a47045..7e824955161 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 c8644da2980..dda2d534e53 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.0}
-\newcommand{\PkgDate}{2017/05/21}
+\newcommand{\PkgVersion}{1.0a}
+\newcommand{\PkgDate}{2018/01/28}
 \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/doc/latex/bxcalc/bxcalcux.pdf b/Master/texmf-dist/doc/latex/bxcalc/bxcalcux.pdf
index e4892f0e3be..3f0f7c4c0b5 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 19eeda4a18d..b2933dbf1bb 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.0}
-\newcommand{\PkgDate}{2017/05/21}
+\newcommand{\PkgVersion}{1.0a}
+\newcommand{\PkgDate}{2018/01/28}
 \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 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