bxjscls (2feb17)

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

10 files changed, 113 insertions, 33 deletions

diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
index 48a71504da8..19de99c4701 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/01/28 v1.3a BXJS document classes]
+  [2017/02/03 v1.4 BXJS document classes]
 %% このファイルは日本語文字を含みます.
 \RequirePackage{calc}
 \RequirePackage{keyval}
@@ -113,7 +113,7 @@
 \fi{\typeout{Farewell!}\endinput\@@end}
 \newif\if@restonecol
 \newif\if@titlepage
-\newif\if@enablejfam \@enablejfamtrue
+\newif\if@enablejfam \@enablejfamfalse
 \def\bxjs@setpaper#1{\def\bxjs@param@paper{#1}}
 \DeclareOption{a3paper}{\bxjs@setpaper{a3paper}}
 \DeclareOption{a4paper}{\bxjs@setpaper{a4paper}}
@@ -237,6 +237,12 @@
       &\global\@eqcnt\thr@@ \hb@xt@\z@\bgroup\hss##\egroup
     \tabskip\z@skip\cr
     }}
+\def\bxjs@kv@enablejfam@true{\let\bxjs@enablejfam=t}
+\def\bxjs@kv@enablejfam@false{\let\bxjs@enablejfam=f}
+\def\bxjs@kv@enablejfam@default{\let\bxjs@enablejfam\@undefined}
+\define@key{bxjs}{enablejfam}{%
+  \bxjs@set@keyval{enablejfam}{#1}{}}
+\DeclareOption{disablejfam}{\let\bxjs@enablejfam=f}
 \let\ifjsDraft\iffalse
 \@onlypreamble\bxjs@draft
 \def\bxjs@draft#1{%
@@ -702,6 +708,7 @@
 \ifbxjs@usezw
   \providecommand*\zw{\jsZw}
 \fi
+\def\zwspace{\hskip\jsZw\relax}
 \ifjsc@mag@xreal
   \RequirePackage{type1cm}
   \let\jsc@invscale\bxjs@invscale
@@ -1637,9 +1644,9 @@
   \advance\leftskip .0628\linewidth
   \advance\rightskip .0628\linewidth
   \vskip\abovecaptionskip
-  \sbox\@tempboxa{#1\hskip1\jsZw\relax #2}%
+  \sbox\@tempboxa{#1\zwspace#2}%
   \ifdim \wd\@tempboxa <\hsize \centering \fi
-  #1\hskip1\jsZw\relax #2\par
+  #1\zwspace#2\par
   \vskip\belowcaptionskip}}
 \newif\if@jsc@warnoldfontcmd
 \@jsc@warnoldfontcmdtrue
@@ -1674,7 +1681,7 @@
     \fi
   \fi}
 \def\bxjs@warnoldfontcmd@final{%
-  \par
+  \global\let\bxjs@warnoldfontcmd@final\@empty
   \let\@tempa\@empty
   \def\do##1{%
     \expandafter\ifx\csname bxjs@ofc/\string##1\endcsname\relax\else
@@ -1695,7 +1702,9 @@
       only for compatibility%
       \@gobble}%
   \fi}
-\AtEndDocument{\bxjs@warnoldfontcmd@final}
+\def\bxjs@warnoldfontcmd@kick@final{%
+  \g@addto@macro\clearpage{\bxjs@warnoldfontcmd@final}}
+\AtEndDocument{\bxjs@warnoldfontcmd@kick@final}
 \jsc@DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
 \jsc@DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
 \jsc@DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
index b498b749ee7..81e6e73e652 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/01/28 v1.3a BXJS document classes]
+  [2017/02/03 v1.4 BXJS document classes]
 %% このファイルは日本語文字を含みます.
 \RequirePackage{calc}
 \RequirePackage{keyval}
@@ -115,7 +115,7 @@
 \newif\if@titlepage
 \newif\if@openright
 \newif\if@mainmatter \@mainmattertrue
-\newif\if@enablejfam \@enablejfamtrue
+\newif\if@enablejfam \@enablejfamfalse
 \def\bxjs@setpaper#1{\def\bxjs@param@paper{#1}}
 \DeclareOption{a3paper}{\bxjs@setpaper{a3paper}}
 \DeclareOption{a4paper}{\bxjs@setpaper{a4paper}}
@@ -241,6 +241,12 @@
       &\global\@eqcnt\thr@@ \hb@xt@\z@\bgroup\hss##\egroup
     \tabskip\z@skip\cr
     }}
+\def\bxjs@kv@enablejfam@true{\let\bxjs@enablejfam=t}
+\def\bxjs@kv@enablejfam@false{\let\bxjs@enablejfam=f}
+\def\bxjs@kv@enablejfam@default{\let\bxjs@enablejfam\@undefined}
+\define@key{bxjs}{enablejfam}{%
+  \bxjs@set@keyval{enablejfam}{#1}{}}
+\DeclareOption{disablejfam}{\let\bxjs@enablejfam=f}
 \let\ifjsDraft\iffalse
 \@onlypreamble\bxjs@draft
 \def\bxjs@draft#1{%
@@ -706,6 +712,7 @@
 \ifbxjs@usezw
   \providecommand*\zw{\jsZw}
 \fi
+\def\zwspace{\hskip\jsZw\relax}
 \ifjsc@mag@xreal
   \RequirePackage{type1cm}
   \let\jsc@invscale\bxjs@invscale
@@ -1707,9 +1714,9 @@
   \advance\leftskip .0628\linewidth
   \advance\rightskip .0628\linewidth
   \vskip\abovecaptionskip
-  \sbox\@tempboxa{#1\hskip1\jsZw\relax #2}%
+  \sbox\@tempboxa{#1\zwspace#2}%
   \ifdim \wd\@tempboxa <\hsize \centering \fi
-  #1\hskip1\jsZw\relax #2\par
+  #1\zwspace#2\par
   \vskip\belowcaptionskip}}
 \newif\if@jsc@warnoldfontcmd
 \@jsc@warnoldfontcmdtrue
@@ -1744,7 +1751,7 @@
     \fi
   \fi}
 \def\bxjs@warnoldfontcmd@final{%
-  \par
+  \global\let\bxjs@warnoldfontcmd@final\@empty
   \let\@tempa\@empty
   \def\do##1{%
     \expandafter\ifx\csname bxjs@ofc/\string##1\endcsname\relax\else
@@ -1765,7 +1772,9 @@
       only for compatibility%
       \@gobble}%
   \fi}
-\AtEndDocument{\bxjs@warnoldfontcmd@final}
+\def\bxjs@warnoldfontcmd@kick@final{%
+  \g@addto@macro\clearpage{\bxjs@warnoldfontcmd@final}}
+\AtEndDocument{\bxjs@warnoldfontcmd@kick@final}
 \jsc@DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
 \jsc@DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
 \jsc@DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
index b0905b61ad3..cb9c99c5aae 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/01/28 v1.3a BXJS document classes]
+  [2017/02/03 v1.4 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 90048f3a464..da4ca8c62c5 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/01/28 v1.3a BXJS document classes]
+  [2017/02/03 v1.4 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 7b663ff252a..b2e5e903fe0 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/01/28 v1.3a BXJS document classes]
+  [2017/02/03 v1.4 BXJS document classes]
 %% このファイルは日本語文字を含みます
 \def\DeclareJaTextFontCommand#1#2{%
   \DeclareRobustCommand#1[1]{%
@@ -29,6 +29,15 @@
     \ifmmode \expandafter\nfss@text \fi
     {#2##1}}%
 }
+\def\DeclareJaMathFontCommand#1#2{%
+  \DeclareRobustCommand#1[1]{%
+    \relax
+    \ifmmode\else \non@alpherr{#1\space}\fi
+    \nfss@text{\fontfamily\familydefault
+        \fontseries{m}\fontshape{n}\selectfont\relax
+        #2##1}%
+  }%
+}
 \long\def\bxjs@@CSsfdefault{\sfdefault}%
 \@onlypreamble\bxjs@if@sf@default
 \def\bxjs@if@sf@default#1{%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def
index 8c450d99ac6..3cce4077a9f 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/01/28 v1.3a BXJS document classes]
+  [2017/02/03 v1.4 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 b2087657ddb..7ae3589d52b 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/01/28 v1.3a BXJS document classes]
+  [2017/02/03 v1.4 BXJS document classes]
 \input{bxjsja-standard.def}
 \@onlypreamble\bxjs@set@dupload@proc
 \def\bxjs@set@dupload@proc#1{%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
index e06a0bedec3..83b66207e0c 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/01/28 v1.3a BXJS document classes]
+  [2017/02/03 v1.4 BXJS document classes]
 %% このファイルは日本語文字を含みます
 \input{bxjsja-minimal.def}
 \bxjs@simplejasetupfalse
@@ -277,6 +277,22 @@
 \fi
 \@namedef{ver@microtype.sty}{2000/01/01}
 \newcommand*\UseMicrotypeSet[2][]{}
+\ifx f\bxjs@enablejfam\else
+  \@enablejfamtrue
+\fi
+\if@enablejfam
+  \DeclareSymbolFont{mincho}{\jsc@JYn}{mc}{m}{n}
+  \DeclareSymbolFontAlphabet{\mathmc}{mincho}
+  \SetSymbolFont{mincho}{bold}{\jsc@JYn}{gt}{m}{n}
+  \jfam\symmincho
+  \DeclareMathAlphabet{\mathgt}{\jsc@JYn}{gt}{m}{n}
+  \AtBeginDocument{%
+    \ifx\reDeclareMathAlphabet\@undefined\else
+      \reDeclareMathAlphabet{\mathrm}{\@mathrm}{\@mathmc}%
+      \reDeclareMathAlphabet{\mathbf}{\@mathbf}{\@mathgt}%
+      \reDeclareMathAlphabet{\mathsf}{\@mathsf}{\@mathgt}%
+    \fi}
+\fi
 \else\if p\jsEngine
 \bxjs@adjust@jafont{f}
 \edef\bxjs@nxt{%
@@ -328,6 +344,11 @@
   \let\CJKecglue\bxjs@CJKecglue}
 \def\bxjs@jachar#1{%
   \CJKforced{#1}}
+\ifx t\bxjs@enablejfam
+  \ClassWarningNoLine\bxjs@clsname
+   {You cannot use 'enablejfam=true', since the\MessageBreak
+    CJK package does not support Japanese math}
+\fi
 \else\if x\jsEngine
 \RequirePackage{zxjatype}
 \PassOptionsToPackage{no-math}{fontspec}%!
@@ -375,12 +396,16 @@
 \def\bxjs@jachar#1{%
   \xeCJKDeclareCharClass{CJK}{`#1}\relax
   #1}
+\ifx t\bxjs@enablejfam
+  \@enablejfamtrue
+\fi
+\if@enablejfam
+  \xeCJKsetup{CJKmath=true}
+\fi
 \else\if l\jsEngine
 \let\zw\@undefined
 \RequirePackage{luatexja}
 \RequirePackage{luatexja-fontspec}
-\PassOptionsToPackage{pdftex}{graphicx}%!
-\PassOptionsToPackage{pdftex}{graphics}%!
 \ExplSyntaxOn
 \fp_gset:Nn \g_ltj_fontspec_scale_fp { \jsScale }
 \ExplSyntaxOff
@@ -409,7 +434,8 @@
    \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
 \AtBeginDocument{%
   \reDeclareMathAlphabet{\mathrm}{\mathrm}{\mathmc}
-  \reDeclareMathAlphabet{\mathbf}{\mathbf}{\mathgt}}%
+  \reDeclareMathAlphabet{\mathbf}{\mathbf}{\mathgt}%
+  \reDeclareMathAlphabet{\mathsf}{\mathsf}{\mathgt}}%
 \bxjs@if@sf@default{%
   \renewcommand\kanjifamilydefault{\gtdefault}}
 \ltjsetparameter{jaxspmode={`！,1}}
@@ -436,9 +462,18 @@
   \ltjsetparameter{xkanjiskip={\@tempskipa}}}
 \def\bxjs@jachar#1{%
   \ltjjachar`#1\relax}
+\ifx f\bxjs@enablejfam
+  \ClassWarningNoLine\bxjs@clsname
+   {You cannot use 'enablejfam=false', since the\MessageBreak
+    LuaTeX-ja always provides Japanese math families}
+\fi
 \fi\fi\fi\fi
 \DeclareJaTextFontCommand{\textmc}{\mcfamily}
 \DeclareJaTextFontCommand{\textgt}{\gtfamily}
+\ifx\mathmc\@undefined
+  \DeclareJaMathFontCommand{\mathmc}{\mcfamily}
+  \DeclareJaMathFontCommand{\mathgt}{\gtfamily}
+\fi
 \setkanjiskip{0pt plus.1\jsZw minus.01\jsZw}
 \ifx\jsDocClass\jsSlide \setxkanjiskip{0.1em}
 \else \setxkanjiskip{0.25em plus 0.15em minus 0.06em}
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
index 4f28c621902..aa90968f3bf 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/01/28 v1.3a BXJS document classes]
+  [2017/02/03 v1.4 BXJS document classes]
 %% このファイルは日本語文字を含みます.
 \RequirePackage{calc}
 \RequirePackage{keyval}
@@ -115,7 +115,7 @@
 \newif\if@titlepage
 \newif\if@openright
 \newif\if@mainmatter \@mainmattertrue
-\newif\if@enablejfam \@enablejfamtrue
+\newif\if@enablejfam \@enablejfamfalse
 \def\bxjs@setpaper#1{\def\bxjs@param@paper{#1}}
 \DeclareOption{a3paper}{\bxjs@setpaper{a3paper}}
 \DeclareOption{a4paper}{\bxjs@setpaper{a4paper}}
@@ -241,6 +241,12 @@
       &\global\@eqcnt\thr@@ \hb@xt@\z@\bgroup\hss##\egroup
     \tabskip\z@skip\cr
     }}
+\def\bxjs@kv@enablejfam@true{\let\bxjs@enablejfam=t}
+\def\bxjs@kv@enablejfam@false{\let\bxjs@enablejfam=f}
+\def\bxjs@kv@enablejfam@default{\let\bxjs@enablejfam\@undefined}
+\define@key{bxjs}{enablejfam}{%
+  \bxjs@set@keyval{enablejfam}{#1}{}}
+\DeclareOption{disablejfam}{\let\bxjs@enablejfam=f}
 \let\ifjsDraft\iffalse
 \@onlypreamble\bxjs@draft
 \def\bxjs@draft#1{%
@@ -706,6 +712,7 @@
 \ifbxjs@usezw
   \providecommand*\zw{\jsZw}
 \fi
+\def\zwspace{\hskip\jsZw\relax}
 \ifjsc@mag@xreal
   \RequirePackage{type1cm}
   \let\jsc@invscale\bxjs@invscale
@@ -1690,9 +1697,9 @@
   \advance\leftskip .0628\linewidth
   \advance\rightskip .0628\linewidth
   \vskip\abovecaptionskip
-  \sbox\@tempboxa{#1\hskip1\jsZw\relax #2}%
+  \sbox\@tempboxa{#1\zwspace#2}%
   \ifdim \wd\@tempboxa <\hsize \centering \fi
-  #1\hskip1\jsZw\relax #2\par
+  #1\zwspace#2\par
   \vskip\belowcaptionskip}}
 \newif\if@jsc@warnoldfontcmd
 \@jsc@warnoldfontcmdtrue
@@ -1727,7 +1734,7 @@
     \fi
   \fi}
 \def\bxjs@warnoldfontcmd@final{%
-  \par
+  \global\let\bxjs@warnoldfontcmd@final\@empty
   \let\@tempa\@empty
   \def\do##1{%
     \expandafter\ifx\csname bxjs@ofc/\string##1\endcsname\relax\else
@@ -1748,7 +1755,9 @@
       only for compatibility%
       \@gobble}%
   \fi}
-\AtEndDocument{\bxjs@warnoldfontcmd@final}
+\def\bxjs@warnoldfontcmd@kick@final{%
+  \g@addto@macro\clearpage{\bxjs@warnoldfontcmd@final}}
+\AtEndDocument{\bxjs@warnoldfontcmd@kick@final}
 \jsc@DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
 \jsc@DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
 \jsc@DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
index fa5f6671767..79921c50550 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/01/28 v1.3a BXJS document classes]
+  [2017/02/03 v1.4 BXJS document classes]
 %% このファイルは日本語文字を含みます.
 \RequirePackage{calc}
 \RequirePackage{keyval}
@@ -113,7 +113,7 @@
 \fi{\typeout{Farewell!}\endinput\@@end}
 \newif\if@restonecol
 \newif\if@titlepage
-\newif\if@enablejfam \@enablejfamtrue
+\newif\if@enablejfam \@enablejfamfalse
 \def\bxjs@setpaper#1{\def\bxjs@param@paper{#1}}
 \DeclareOption{a3paper}{\bxjs@setpaper{a3paper}}
 \DeclareOption{a4paper}{\bxjs@setpaper{a4paper}}
@@ -237,6 +237,12 @@
       &\global\@eqcnt\thr@@ \hb@xt@\z@\bgroup\hss##\egroup
     \tabskip\z@skip\cr
     }}
+\def\bxjs@kv@enablejfam@true{\let\bxjs@enablejfam=t}
+\def\bxjs@kv@enablejfam@false{\let\bxjs@enablejfam=f}
+\def\bxjs@kv@enablejfam@default{\let\bxjs@enablejfam\@undefined}
+\define@key{bxjs}{enablejfam}{%
+  \bxjs@set@keyval{enablejfam}{#1}{}}
+\DeclareOption{disablejfam}{\let\bxjs@enablejfam=f}
 \let\ifjsDraft\iffalse
 \@onlypreamble\bxjs@draft
 \def\bxjs@draft#1{%
@@ -701,6 +707,7 @@
 \ifbxjs@usezw
   \providecommand*\zw{\jsZw}
 \fi
+\def\zwspace{\hskip\jsZw\relax}
 \ifjsc@mag@xreal
   \RequirePackage{type1cm}
   \let\jsc@invscale\bxjs@invscale
@@ -1635,9 +1642,9 @@
   \advance\leftskip .0628\linewidth
   \advance\rightskip .0628\linewidth
   \vskip\abovecaptionskip
-  \sbox\@tempboxa{#1\hskip1\jsZw\relax #2}%
+  \sbox\@tempboxa{#1\zwspace#2}%
   \ifdim \wd\@tempboxa <\hsize \centering \fi
-  #1\hskip1\jsZw\relax #2\par
+  #1\zwspace#2\par
   \vskip\belowcaptionskip}}
 \newif\if@jsc@warnoldfontcmd
 \@jsc@warnoldfontcmdtrue
@@ -1672,7 +1679,7 @@
     \fi
   \fi}
 \def\bxjs@warnoldfontcmd@final{%
-  \par
+  \global\let\bxjs@warnoldfontcmd@final\@empty
   \let\@tempa\@empty
   \def\do##1{%
     \expandafter\ifx\csname bxjs@ofc/\string##1\endcsname\relax\else
@@ -1693,7 +1700,9 @@
       only for compatibility%
       \@gobble}%
   \fi}
-\AtEndDocument{\bxjs@warnoldfontcmd@final}
+\def\bxjs@warnoldfontcmd@kick@final{%
+  \g@addto@macro\clearpage{\bxjs@warnoldfontcmd@final}}
+\AtEndDocument{\bxjs@warnoldfontcmd@kick@final}
 \jsc@DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
 \jsc@DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
 \jsc@DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}