bxjscls (29jan18)

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

11 files changed, 83 insertions, 16 deletions

diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
index 727695aac20..710ebf42235 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{bxjsarticle}
-  [2017/12/09 v1.7a BXJS document classes]
+  [2018/01/28 v1.7b BXJS document classes]
 %% このファイルは日本語文字を含みます.
 \def\bxjs@clsname{bxjsarticle}
 \newif\ifjsc@needsp@tch
@@ -858,6 +858,13 @@
 \else
   \def\jsc@setfontsize#1#2#3{%
     \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}}
+  \ifjsWitheTeX\if j\jsEngine\else
+    \def\jsc@setfontsize#1#2#3{%
+      \edef\bxjs@sfs@next{%
+        \unexpanded{\@setfontsize#1}%
+           {\the\dimexpr#2\jsc@mpt\relax}{\the\dimexpr#3\jsc@mpt\relax}%
+      }\bxjs@sfs@next}
+  \fi\fi
 \fi
 \emergencystretch 3\jsZw
 \newif\ifnarrowbaselines
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
index 16b7789adb3..2c810c8d032 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{bxjsbook}
-  [2017/12/09 v1.7a BXJS document classes]
+  [2018/01/28 v1.7b BXJS document classes]
 %% このファイルは日本語文字を含みます.
 \def\bxjs@clsname{bxjsbook}
 \newif\ifjsc@needsp@tch
@@ -867,6 +867,13 @@
 \else
   \def\jsc@setfontsize#1#2#3{%
     \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}}
+  \ifjsWitheTeX\if j\jsEngine\else
+    \def\jsc@setfontsize#1#2#3{%
+      \edef\bxjs@sfs@next{%
+        \unexpanded{\@setfontsize#1}%
+           {\the\dimexpr#2\jsc@mpt\relax}{\the\dimexpr#3\jsc@mpt\relax}%
+      }\bxjs@sfs@next}
+  \fi\fi
 \fi
 \emergencystretch 3\jsZw
 \newif\ifnarrowbaselines
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
index c1a11c569a9..2e167e1a0ef 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
@@ -21,7 +21,7 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 \ProvidesPackage{bxjscjkcat}
-  [2017/12/09 v1.7a BXJS document classes]
+  [2018/01/28 v1.7b BXJS document classes]
 \def\bxjx@pkgname{bxjscjkcat}
 \newcount\bxjx@cnta
 \let\bxjx@engine=n
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty
index f89db878fb4..d314fb6f334 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty
@@ -21,7 +21,7 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 \ProvidesPackage{bxjscompat}
-  [2017/12/09 v1.7a BXJS document classes]
+  [2018/01/28 v1.7b BXJS document classes]
 \def\bxac@pkgname{bxjscompat}
 \let\bxac@engine=n
 \def\bxac@do#1#2{%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def
index 7e63ee04f04..a6ea021beac 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def
@@ -21,7 +21,7 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 \ProvidesFile{bxjsja-minimal.def}
-  [2017/12/09 v1.7a BXJS document classes]
+  [2018/01/28 v1.7b BXJS document classes]
 %% このファイルは日本語文字を含みます
 \def\DeclareJaTextFontCommand#1#2{%
   \DeclareRobustCommand#1[1]{%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def
index dfeb783f38a..88fd3452075 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def
@@ -21,7 +21,7 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 \ProvidesFile{bxjsja-modern.def}
-  [2017/12/09 v1.7a BXJS document classes]
+  [2018/01/28 v1.7b BXJS document classes]
 \input{bxjsja-standard.def}
 \ifnum0\if x\jsEngine1\fi\if l\jsEngine1\fi=\z@
 \def\encodingdefault{T1}%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def
index 46222f227e8..1ceba42b7e7 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def
@@ -21,7 +21,7 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 \ProvidesFile{bxjsja-pandoc.def}
-  [2017/12/09 v1.7a BXJS document classes]
+  [2018/01/28 v1.7b BXJS document classes]
 \input{bxjsja-standard.def}
 \RequirePackage{bxjspandoc}
 \@onlypreamble\bxjs@set@dupload@proc
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
index 0e2707059e0..ef8c0b5989b 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
@@ -21,7 +21,7 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 \ProvidesFile{bxjsja-standard.def}
-  [2017/12/09 v1.7a BXJS document classes]
+  [2018/01/28 v1.7b BXJS document classes]
 %% このファイルは日本語文字を含みます
 \input{bxjsja-minimal.def}
 \bxjs@simplejasetupfalse
@@ -30,6 +30,11 @@
 \bxjs@cslet{bxjs@kv@jis2004@false}\bxjs@jp@jismmivfalse
 \define@key{bxjsStd}{jis2004}[true]{%
   \bxjs@set@keyval{jis2004}{#1}{}}
+\newif\ifbxjs@jp@units
+\let\bxjs@kv@units@true\bxjs@jp@unitstrue
+\let\bxjs@kv@units@false\bxjs@jp@unitsfalse
+\define@key{bxjsStd}{units}[true]{%
+  \bxjs@set@keyval{units}{#1}{}}
 \let\bxjs@jp@font\@empty
 \define@key{bxjsStd}{font}{%
   \edef\bxjs@jp@font{#1}}
@@ -39,6 +44,21 @@
   \g@addto@macro\@classoptionslist{,jis2004}
   \PassOptionsToPackage{jis2004}{otf}
 \fi
+\ifbxjs@jp@units\if j\jsEngine\else
+  \IfFileExists{bxcalc.sty}{%
+    \RequirePackage{bxcalc}[2018/01/28]%v1.0a
+    \ifx\usepTeXunits\@undefined
+      \PackageWarningNoLine\bxjs@clsname
+       {Cannot support pTeX units (zw etc.), since\MessageBreak
+        the package 'bxcalc' is too old}%
+    \else \usepTeXunits
+    \fi
+  }{%else
+    \PackageWarningNoLine\bxjs@clsname
+     {Cannot support pTeX units (zw etc.), since\MessageBreak
+      the package 'bxcalc' is unavailable}%
+  }
+\fi\fi
 \ifjsWitheTeX
   \@tempdima=0.25mm
   \protected\edef\jQ{\dimexpr\the\@tempdima\relax}
@@ -72,6 +92,9 @@
 \if j\jsEngine
 \def\bxjs@parse@qh#1{%
   \let\bxjs@tmpb\relax}
+\else\ifbxjs@jp@units
+\def\bxjs@parse@qh#1{%
+  \let\bxjs@tmpb\relax}
 \else
 \def\bxjs@parse@qh#1{%
   \def\bxjs@tmpa{#1}\let\bxjs@tmpb\relax
@@ -86,7 +109,7 @@
   \fi}
 \def\bxjs@parse@qh@b#1#2#3{%
   \ifx\@nnil#2\@nnil\else \def\bxjs@tmpb{#1#3}\fi}
-\fi
+\fi\fi
 \def\jafontsize#1#2{%
   \begingroup
     \bxjs@jafontsize@a{#1}%
@@ -268,6 +291,15 @@
     }{}%
   }%
 }
+\def\bxjs@resolve@jafont@paren#1{%
+  \def\bxjs@tmpb{\let#1}%
+  \expandafter\bxjs@resolve@jafont@paren@a#1\@nil()\@nil\relax}
+\def\bxjs@resolve@jafont@paren@a#1(#2)#3\@nil#4\relax{%
+  \ifx\relax#4\relax \bxjs@tmpb\jsJaFont
+  \else
+    \edef\bxjs@tmpa{#1\bxjs@jafont@paren{#2}#3}%
+    \bxjs@tmpb\bxjs@tmpa
+  \fi}
 \if j\jsEngine
 \def\bxjs@apply@kanjiskip{%
   \kanjiskip\@tempskipa}
@@ -308,12 +340,14 @@
   \PassOptionsToPackage{prefer2004jis}{pxchfon}
   \PassOptionsToPackage{prefer2004jis}{pxbabel}
 \fi
+\let\bxjs@jafont@paren\@firstofone
 \let\bxjs@tmpa\jsJaFont
 \ifx\bxjs@tmpa\bxjs@@auto
   \let\bxjs@tmpa\@empty
 \else\ifx\bxjs@tmpa\bxjs@@noEmbed
   \def\bxjs@tmpa{noembed}
 \fi\fi
+\bxjs@resolve@jafont@paren\bxjs@tmpa
 \edef\bxjs@tmpa{\bxjs@catopt\bxjs@tmpa\bxjs@jp@font}
 \ifx\bxjs@tmpa\@empty\else
   \edef\bxjs@next{%
@@ -385,6 +419,8 @@
 \fi
 \else\if p\jsEngine
 \bxjs@adjust@jafont{f}
+\let\bxjs@jafont@paren\@firstofone
+\bxjs@resolve@jafont@paren\bxjs@tmpa
 \edef\bxjs@tmpa{\bxjs@catopt\bxjs@tmpa\bxjs@jp@font}
 \edef\bxjs@tmpa{\bxjs@catopt\bxjs@tmpa{whole}}
 \def\bxjs@tmpb{pandoc}\ifx\bxjs@tmpb\bxjs@jadriver\else
@@ -457,6 +493,8 @@
   {xeCJK or zxjatype is too old}\@ehc
 \fi
 \bxjs@adjust@jafont{f}
+\let\bxjs@jafont@paren\@gobble
+\bxjs@resolve@jafont@paren\bxjs@tmpa
 \edef\bxjs@tmpa{\bxjs@catopt\bxjs@tmpa\bxjs@jp@font}
 \ifx\bxjs@tmpa\@empty
   \setCJKmainfont[BoldFont=IPAexGothic]{IPAexMincho}
@@ -516,14 +554,15 @@
 \else\if l\jsEngine
 \let\zw\@undefined
 \RequirePackage{luatexja}
-\RequirePackage{luatexja-fontspec}
-\ExplSyntaxOn
-\fp_gset:Nn \g_ltj_fontspec_scale_fp { \jsScale }
-\ExplSyntaxOff
+\edef\bxjs@next{%
+  \noexpand\RequirePackage[scale=\jsScale]{luatexja-fontspec}[2015/08/26]%
+}\bxjs@next
 \bxjs@adjust@jafont{t}
 \ifx\bxjs@tmpa\bxjs@@noEmbed
   \def\bxjs@tmpa{noembed}
 \fi
+\let\bxjs@jafont@paren\@gobble
+\bxjs@resolve@jafont@paren\bxjs@tmpa
 \edef\bxjs@tmpa{\bxjs@catopt\bxjs@tmpa\bxjs@jp@font}
 \ifx\bxjs@tmpa\@empty
   \defaultjfontfeatures{ Kerning=Off }
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
index 937c86968c8..da67cf9921c 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
@@ -21,7 +21,7 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 \ProvidesPackage{bxjspandoc}
-  [2017/12/09 v1.7a BXJS document classes]
+  [2018/01/28 v1.7b BXJS document classes]
 %% このファイルは日本語文字を含みます.
 \def\bxjsp@pkgname{bxjscjkcat}
 \let\bxjsp@engine=n
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
index dc07cb1c934..a559b5dab58 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{bxjsreport}
-  [2017/12/09 v1.7a BXJS document classes]
+  [2018/01/28 v1.7b BXJS document classes]
 %% このファイルは日本語文字を含みます.
 \def\bxjs@clsname{bxjsreport}
 \newif\ifjsc@needsp@tch
@@ -866,6 +866,13 @@
 \else
   \def\jsc@setfontsize#1#2#3{%
     \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}}
+  \ifjsWitheTeX\if j\jsEngine\else
+    \def\jsc@setfontsize#1#2#3{%
+      \edef\bxjs@sfs@next{%
+        \unexpanded{\@setfontsize#1}%
+           {\the\dimexpr#2\jsc@mpt\relax}{\the\dimexpr#3\jsc@mpt\relax}%
+      }\bxjs@sfs@next}
+  \fi\fi
 \fi
 \emergencystretch 3\jsZw
 \newif\ifnarrowbaselines
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
index 090ff05019f..da673d9f45b 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{bxjsslide}
-  [2017/12/09 v1.7a BXJS document classes]
+  [2018/01/28 v1.7b BXJS document classes]
 %% このファイルは日本語文字を含みます.
 \def\bxjs@clsname{bxjsslide}
 \newif\ifjsc@needsp@tch
@@ -857,6 +857,13 @@
 \else
   \def\jsc@setfontsize#1#2#3{%
     \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}}
+  \ifjsWitheTeX\if j\jsEngine\else
+    \def\jsc@setfontsize#1#2#3{%
+      \edef\bxjs@sfs@next{%
+        \unexpanded{\@setfontsize#1}%
+           {\the\dimexpr#2\jsc@mpt\relax}{\the\dimexpr#3\jsc@mpt\relax}%
+      }\bxjs@sfs@next}
+  \fi\fi
 \fi
 \emergencystretch 3\jsZw
 \newif\ifnarrowbaselines