bxjscls (21oct17)

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

11 files changed, 266 insertions, 75 deletions

diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
index 7a22892d8e5..716134ef316 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/09/24 v1.6a BXJS document classes]
+  [2017/10/21 v1.7 BXJS document classes]
 %% このファイルは日本語文字を含みます.
 \def\bxjs@clsname{bxjsarticle}
 \newif\ifjsc@needsp@tch
@@ -541,14 +541,27 @@
 \let\bxjs@kv@wholezwlines@true\bxjs@whole@zw@linestrue
 \let\bxjs@kv@wholezwlines@false\bxjs@whole@zw@linesfalse
 \define@key{bxjs}{whole-zw-lines}[true]{\bxjs@set@keyval{wholezwlines}{#1}{}}
-\newif\ifbxjs@xkanjiskip@cmd \bxjs@xkanjiskip@cmdtrue
-\let\bxjs@kv@xkanjiskipcmd@true\bxjs@xkanjiskip@cmdtrue
-\let\bxjs@kv@xkanjiskipcmd@false\bxjs@xkanjiskip@cmdfalse
-\define@key{bxjs}{xkanjiskip-cmd}[true]{\bxjs@set@keyval{xkanjiskipcmd}{#1}{}}
+\newif\ifbxjs@jaspace@cmd \bxjs@jaspace@cmdtrue
+\let\bxjs@kv@jaspacecmd@true\bxjs@jaspace@cmdtrue
+\let\bxjs@kv@jaspacecmd@false\bxjs@jaspace@cmdfalse
+\define@key{bxjs}{jaspace-cmd}[true]{\bxjs@set@keyval{jaspacecmd}{#1}{}}
+\define@key{bxjs}{xkanjiskip-cmd}[true]{\bxjs@set@keyval{jaspacecmd}{#1}{}}
 \newif\ifbxjs@hyperref@enc \bxjs@hyperref@enctrue
 \let\bxjs@kv@hyperrefenc@true\bxjs@hyperref@enctrue
 \let\bxjs@kv@hyperrefenc@false\bxjs@hyperref@encfalse
 \define@key{bxjs}{hyperref-enc}[true]{\bxjs@set@keyval{hyperrefenc}{#1}{}}
+\chardef\bxjs@everyparhook@none=0
+\chardef\bxjs@everyparhook@compat=1
+\chardef\bxjs@everyparhook@modern=2
+\if j\jsEngine
+  \let\bxjs@everyparhook\bxjs@everyparhook@compat
+\else
+  \let\bxjs@everyparhook\bxjs@everyparhook@modern
+\fi
+\def\bxjs@kv@everyparhook@none{\let\bxjs@everyparhook\bxjs@everyparhook@none}
+\def\bxjs@kv@everyparhook@compat{\let\bxjs@everyparhook\bxjs@everyparhook@compat}
+\def\bxjs@kv@everyparhook@modern{\let\bxjs@everyparhook\bxjs@everyparhook@modern}
+\define@key{bxjs}{everyparhook}{\bxjs@set@keyval{everyparhook}{#1}{}}
 \let\bxjs@ltx@removeelement\@removeelement
 \def\@removeelement#1#2#3{%
   \def\reserved@a{#2}%
@@ -1323,6 +1336,10 @@
   \@ifstar
     {\@ssect{#3}{#4}{#5}{#6}}%
     {\@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}}
+\ifnum\bxjs@everyparhook=\bxjs@everyparhook@compat
+  \let\bxjs@if@ceph\@firstofone
+\else \let\bxjs@if@ceph\@gobble
+\fi
 \def\@sect#1#2#3#4#5#6[#7]#8{%
   \ifnum #2>\c@secnumdepth
     \let\@svsec\@empty
@@ -1370,11 +1387,10 @@
         \unskip
         \@tempskipa #1\relax
         \hskip -\@tempskipa
-        \bxjs@ltj@inhibitglue
       \else
         \clubpenalty \@clubpenalty
-        \everypar{\everyparhook}%
-      \fi\everyparhook}%
+        \everypar\expandafter{\bxjs@if@ceph\everyparhook}%
+      \fi\bxjs@if@ceph\everyparhook}%
   \else
     \par \nobreak
     \vskip \@tempskipa
@@ -1399,7 +1415,6 @@
     \endgroup
   \fi
   \@xsect{#3}}
-\let\bxjs@ltj@inhibitglue\@empty
 \newcommand*\chaptermark[1]{}
 \setcounter{secnumdepth}{3}
 \newcounter{part}
@@ -1989,7 +2004,10 @@
   \llap{\@makefnmark\hskip0.3\jsZw}#1}
 \let\jsInhibitGlueAtParTop\@empty
 \def\everyparhook{\jsInhibitGlueAtParTop}
+\ifnum\bxjs@everyparhook=\bxjs@everyparhook@compat
 \AtBeginDocument{\everypar{\everyparhook}}
+\fi
+\ifx j\jsEngine
 \def\@inhibitglue{%
   \futurelet\@let@token\@@inhibitglue}
 \begingroup
@@ -2017,6 +2035,8 @@
       \inhibitglue
     \fi
   \fi}
+\fi
+\ifnum\bxjs@everyparhook=\bxjs@everyparhook@compat
 \def\@doendpe{%
   \@endpetrue
   \def\par{%
@@ -2069,7 +2089,6 @@
       \clubpenalty \@clubpenalty
       \everypar{\everyparhook}%
     \fi
-    \bxjs@ltj@inhibitglue
     \everyparhook}%
   \if@noitemarg
     \@noitemargfalse
@@ -2103,6 +2122,9 @@
       \clubpenalty \@clubpenalty
       \everypar{\everyparhook}%
     \fi\everyparhook}}
+\fi
+\ifnum\bxjs@everyparhook=\bxjs@everyparhook@none\else
+\AtEndOfPackage{%
 \def\@gnewline #1{%
   \ifvmode
     \@nolnerr
@@ -2110,6 +2132,8 @@
     \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
     \jsInhibitGlue \ignorespaces
   \fi}
+}
+\fi
 \if@jslogo
   \IfFileExists{jslogo.sty}{%
     \RequirePackage{jslogo}%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
index 5a89ea06886..819886cfca0 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/09/24 v1.6a BXJS document classes]
+  [2017/10/21 v1.7 BXJS document classes]
 %% このファイルは日本語文字を含みます.
 \def\bxjs@clsname{bxjsbook}
 \newif\ifjsc@needsp@tch
@@ -550,14 +550,27 @@
 \let\bxjs@kv@wholezwlines@true\bxjs@whole@zw@linestrue
 \let\bxjs@kv@wholezwlines@false\bxjs@whole@zw@linesfalse
 \define@key{bxjs}{whole-zw-lines}[true]{\bxjs@set@keyval{wholezwlines}{#1}{}}
-\newif\ifbxjs@xkanjiskip@cmd \bxjs@xkanjiskip@cmdtrue
-\let\bxjs@kv@xkanjiskipcmd@true\bxjs@xkanjiskip@cmdtrue
-\let\bxjs@kv@xkanjiskipcmd@false\bxjs@xkanjiskip@cmdfalse
-\define@key{bxjs}{xkanjiskip-cmd}[true]{\bxjs@set@keyval{xkanjiskipcmd}{#1}{}}
+\newif\ifbxjs@jaspace@cmd \bxjs@jaspace@cmdtrue
+\let\bxjs@kv@jaspacecmd@true\bxjs@jaspace@cmdtrue
+\let\bxjs@kv@jaspacecmd@false\bxjs@jaspace@cmdfalse
+\define@key{bxjs}{jaspace-cmd}[true]{\bxjs@set@keyval{jaspacecmd}{#1}{}}
+\define@key{bxjs}{xkanjiskip-cmd}[true]{\bxjs@set@keyval{jaspacecmd}{#1}{}}
 \newif\ifbxjs@hyperref@enc \bxjs@hyperref@enctrue
 \let\bxjs@kv@hyperrefenc@true\bxjs@hyperref@enctrue
 \let\bxjs@kv@hyperrefenc@false\bxjs@hyperref@encfalse
 \define@key{bxjs}{hyperref-enc}[true]{\bxjs@set@keyval{hyperrefenc}{#1}{}}
+\chardef\bxjs@everyparhook@none=0
+\chardef\bxjs@everyparhook@compat=1
+\chardef\bxjs@everyparhook@modern=2
+\if j\jsEngine
+  \let\bxjs@everyparhook\bxjs@everyparhook@compat
+\else
+  \let\bxjs@everyparhook\bxjs@everyparhook@modern
+\fi
+\def\bxjs@kv@everyparhook@none{\let\bxjs@everyparhook\bxjs@everyparhook@none}
+\def\bxjs@kv@everyparhook@compat{\let\bxjs@everyparhook\bxjs@everyparhook@compat}
+\def\bxjs@kv@everyparhook@modern{\let\bxjs@everyparhook\bxjs@everyparhook@modern}
+\define@key{bxjs}{everyparhook}{\bxjs@set@keyval{everyparhook}{#1}{}}
 \let\bxjs@ltx@removeelement\@removeelement
 \def\@removeelement#1#2#3{%
   \def\reserved@a{#2}%
@@ -1350,6 +1363,10 @@
   \@ifstar
     {\@ssect{#3}{#4}{#5}{#6}}%
     {\@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}}
+\ifnum\bxjs@everyparhook=\bxjs@everyparhook@compat
+  \let\bxjs@if@ceph\@firstofone
+\else \let\bxjs@if@ceph\@gobble
+\fi
 \def\@sect#1#2#3#4#5#6[#7]#8{%
   \ifnum #2>\c@secnumdepth
     \let\@svsec\@empty
@@ -1397,11 +1414,10 @@
         \unskip
         \@tempskipa #1\relax
         \hskip -\@tempskipa
-        \bxjs@ltj@inhibitglue
       \else
         \clubpenalty \@clubpenalty
-        \everypar{\everyparhook}%
-      \fi\everyparhook}%
+        \everypar\expandafter{\bxjs@if@ceph\everyparhook}%
+      \fi\bxjs@if@ceph\everyparhook}%
   \else
     \par \nobreak
     \vskip \@tempskipa
@@ -1426,7 +1442,6 @@
     \endgroup
   \fi
   \@xsect{#3}}
-\let\bxjs@ltj@inhibitglue\@empty
 \newcommand*\chaptermark[1]{}
 \setcounter{secnumdepth}{2}
 \newcounter{part}
@@ -2096,7 +2111,10 @@
   \llap{\@makefnmark\hskip0.3\jsZw}#1}
 \let\jsInhibitGlueAtParTop\@empty
 \def\everyparhook{\jsInhibitGlueAtParTop}
+\ifnum\bxjs@everyparhook=\bxjs@everyparhook@compat
 \AtBeginDocument{\everypar{\everyparhook}}
+\fi
+\ifx j\jsEngine
 \def\@inhibitglue{%
   \futurelet\@let@token\@@inhibitglue}
 \begingroup
@@ -2124,6 +2142,8 @@
       \inhibitglue
     \fi
   \fi}
+\fi
+\ifnum\bxjs@everyparhook=\bxjs@everyparhook@compat
 \def\@doendpe{%
   \@endpetrue
   \def\par{%
@@ -2176,7 +2196,6 @@
       \clubpenalty \@clubpenalty
       \everypar{\everyparhook}%
     \fi
-    \bxjs@ltj@inhibitglue
     \everyparhook}%
   \if@noitemarg
     \@noitemargfalse
@@ -2210,6 +2229,9 @@
       \clubpenalty \@clubpenalty
       \everypar{\everyparhook}%
     \fi\everyparhook}}
+\fi
+\ifnum\bxjs@everyparhook=\bxjs@everyparhook@none\else
+\AtEndOfPackage{%
 \def\@gnewline #1{%
   \ifvmode
     \@nolnerr
@@ -2217,6 +2239,8 @@
     \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
     \jsInhibitGlue \ignorespaces
   \fi}
+}
+\fi
 \if@jslogo
   \IfFileExists{jslogo.sty}{%
     \RequirePackage{jslogo}%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
index 8ac1d5150c5..473adb8082d 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/09/24 v1.6a BXJS document classes]
+  [2017/10/21 v1.7 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 e72267bcb31..c36f490f226 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/09/24 v1.6a BXJS document classes]
+  [2017/10/21 v1.7 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 8b6e7326583..6e699799db0 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/09/24 v1.6a BXJS document classes]
+  [2017/10/21 v1.7 BXJS document classes]
 %% このファイルは日本語文字を含みます
 \def\DeclareJaTextFontCommand#1#2{%
   \DeclareRobustCommand#1[1]{%
@@ -286,6 +286,21 @@
     \bxjs@do@precisetext
   \fi
 \fi
+\@onlypreamble\bxjs@check@everyparhook
+\def\bxjs@check@everyparhook{%
+  \ifx\jsInhibitGlueAtParTop\@empty
+    \def\bxjs@tmpa{\jsInhibitGlueAtParTop}%
+    \ifx\everyparhook\bxjs@tmpa
+      \let\everyparhook\@empty
+    \fi
+  \fi}
+\AtBeginDocument{\bxjs@check@everyparhook}
+\ifnum\bxjs@everyparhook=\bxjs@everyparhook@modern
+  \let\bxjs@everypar\everypar
+  \newtoks\everypar
+  \everypar\bxjs@everypar
+  \bxjs@everypar{\the\expandafter\everypar\everyparhook}%
+\fi
 \ifbxjs@fancyhdr
 \@onlypreamble\bxjs@adjust@fancyhdr
 \def\bxjs@adjust@fancyhdr{%
@@ -323,6 +338,21 @@
 \AtBeginDocument{%
   \bxjs@pagestyle@hook
   \global\let\bxjs@pagestyle@hook\relax}
+\ifbxjs@jaspace@cmd
+  \def\jaenspace{\hskip.5\jsZw\relax}
+  \def\jathinspace{\hskip\z@skip}
+  \def\　{\zwspace}
+  \DeclareRobustCommand*{\jaspace}[1]{%
+    \expandafter\ifx\csname bxjs@jaspace@@#1\endcsname\relax
+      \ClassError\bxjs@clsname
+       {Unknown jaspace: #1}{\@eha}%
+    \else
+      \csname bxjs@jaspace@@#1\endcsname
+    \fi}
+  \def\bxjs@jaspace@@zenkaku{\hskip 1\jsZw\relax}
+  \def\bxjs@jaspace@@nibu{\hskip .5\jsZw\relax}
+  \def\bxjs@jaspace@@shibu{\hskip .25\jsZw\relax}
+\fi
 \fi
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def
index 1d66deb3f7e..4e09f6d071f 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/09/24 v1.6a BXJS document classes]
+  [2017/10/21 v1.7 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 1412fa21374..73df73dec2a 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/09/24 v1.6a BXJS document classes]
+  [2017/10/21 v1.7 BXJS document classes]
 \input{bxjsja-standard.def}
 \RequirePackage{bxjspandoc}
 \@onlypreamble\bxjs@set@dupload@proc
@@ -92,6 +92,20 @@
   \if@tempswa\ifx\jsParagraphMark\bxjs@org@paragraph@mark
     \let\jsParagraphMark\@empty
   \fi\fi}
+\ifnum0\if x\jsEngine1\fi\if l\jsEngine1\fi>\z@
+  \catcode"3000=\active
+  \begingroup \catcode`\!=7
+  \protected\gdef!!!!3000{\zwspace}
+  \endgroup
+\else\ifx\DeclareUnicodeCharacter\@undefined\else
+  \DeclareUnicodeCharacter{3000}{\bxjs@zsp@char}
+  \bxjs@protected\def\bxjs@zsp@char{\zwspace}
+\fi\fi
+\if j\jsEngine
+  \bxjs@fix@hyperref@unicode{false}
+\else
+  \bxjs@fix@hyperref@unicode{true}
+\fi
 \endinput
 %%
 %% End of file `bxjsja-pandoc.def'.
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
index 3f9d1282d58..ad1a5222703 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/09/24 v1.6a BXJS document classes]
+  [2017/10/21 v1.7 BXJS document classes]
 %% このファイルは日本語文字を含みます
 \input{bxjsja-minimal.def}
 \bxjs@simplejasetupfalse
@@ -235,6 +235,26 @@
     }%
   }%
 }
+\@onlypreamble\jsCheckHyperrefUnicode
+\let\jsCheckHyperrefUnicode\@empty
+\AtBeginDocument{\jsCheckHyperrefUnicode}
+\@onlypreamble\bxjs@check@hyperref@unicode
+\def\bxjs@check@hyperref@unicode#1{%
+  \g@addto@macro\jsCheckHyperrefUnicode{%
+    \@tempswafalse
+    \begingroup
+      \expandafter\ifx\csname ifHy@unicode\endcsname\relax
+        \aftergroup\@tempswatrue \fi
+      \expandafter\ifx\csname ifHy@unicode\expandafter\endcsname
+          \csname if#1\endcsname
+        \aftergroup\@tempswatrue \fi
+    \endgroup
+    \if@tempswa\else
+      \ClassError\bxjs@clsname
+       {The value of hyperref 'unicode' key is not suitable\MessageBreak
+        for the present engine (must be #1)}%
+       {\@ehc}%
+    \fi}}
 \@onlypreamble\bxjs@urgent@special
 \def\bxjs@urgent@special#1{%
   \AtBeginDvi{\special{#1}}%
@@ -281,14 +301,8 @@
       \bxUInt{\@tempcnta}%
     \fi}
 \fi
-\ifbxjs@xkanjiskip@cmd
-  \def\bxjs@put@xkanjiskip{%
-    \relax\ifmmode \mskip\medmuskip
-    \else \hskip\xkanjiskip
-    \fi}
-  \ifjsWitheTeX \protected\def\>{\bxjs@put@xkanjiskip}
-  \else \def\>{\protect\bxjs@put@xkanjiskip}
-  \fi
+\ifbxjs@jaspace@cmd
+  \def\jathinspace{\hskip\xkanjiskip}
 \fi
 \ifbxjs@jp@jismmiv
   \PassOptionsToPackage{prefer2004jis}{pxchfon}
@@ -335,7 +349,7 @@
 \endgroup}
 \@gtempa
 \ifbxjs@hyperref@enc
-  \bxjs@fix@hyperref@unicode{false}
+  \bxjs@check@hyperref@unicode{false}
 \fi
 \if \ifx\bxjs@driver@given\bxjs@driver@@dvipdfmx T%
     \else\ifjsWithpTeXng T\else F\fi\fi T%
@@ -372,7 +386,10 @@
 \else\if p\jsEngine
 \bxjs@adjust@jafont{f}
 \edef\bxjs@tmpa{\bxjs@catopt\bxjs@tmpa\bxjs@jp@font}
-\edef\bxjs@tmpa{\bxjs@catopt\bxjs@tmpa{whole,autotilde}}
+\edef\bxjs@tmpa{\bxjs@catopt\bxjs@tmpa{whole}}
+\def\bxjs@tmpb{pandoc}\ifx\bxjs@tmpb\bxjs@jadriver\else
+  \edef\bxjs@tmpa{\bxjs@catopt\bxjs@tmpa{autotilde}}
+\fi
 \edef\bxjs@next{%
   \noexpand\RequirePackage[\bxjs@tmpa]{bxcjkjatype}[2013/10/15]% v0.2c
 }\bxjs@next
@@ -422,9 +439,8 @@
   \let\CJKecglue\bxjs@CJKecglue}
 \def\bxjs@jachar#1{%
   \CJKforced{#1}}
-\ifbxjs@xkanjiskip@cmd
-  \protected\def\>{%
-    \relax\ifmmode \mskip\medmuskip \else \CJKecglue\ignorespaces \fi}
+\ifbxjs@jaspace@cmd
+  \protected\def\jathinspace{\CJKecglue}
 \fi
 \ifx t\bxjs@enablejfam
   \ClassWarningNoLine\bxjs@clsname
@@ -455,7 +471,15 @@
     \PassOptionsToPackage{unicode}{hyperref}
   \fi
 \fi
-\let\jsInhibitGlueAtParTop\@empty
+\AtEndOfPackage{%
+\def\@gnewline #1{%
+  \ifvmode \@nolnerr
+  \else
+    \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
+    \nobreak \hskip-1sp\hskip1sp\relax
+    \ignorespaces
+  \fi}
+}
 \newskip\jsKanjiSkip
 \newskip\jsXKanjiSkip
 \ifx\CJKecglue\@undefined
@@ -480,9 +504,8 @@
 \def\bxjs@jachar#1{%
   \xeCJKDeclareCharClass{CJK}{`#1}\relax
   #1}
-\ifbxjs@xkanjiskip@cmd
-  \protected\def\>{%
-    \relax\ifmmode \mskip\medmuskip \else \CJKecglue\ignorespaces \fi}
+\ifbxjs@jaspace@cmd
+  \protected\def\jathinspace{\CJKecglue}
 \fi
 \ifx t\bxjs@enablejfam
   \@enablejfamtrue
@@ -530,13 +553,33 @@
 \ltjsetparameter{jaxspmode={`〒,2}}
 \ltjsetparameter{alxspmode={`+,3}}
 \ltjsetparameter{alxspmode={`\%,3}}
-\protected\def\@inhibitglue{%
-  \directlua{%
-    luatexja.jfmglue.create_beginpar_node()}}
-\let\bxjs@ltj@inhibitglue\@inhibitglue
-\let\@@inhibitglue\@undefined
+\ifx\ltjfakeparbegin\@undefined
+  \protected\def\ltjfakeparbegin{%
+    \ifhmode
+      \relax\directlua{%
+        luatexja.jfmglue.create_beginpar_node()}}
+    \fi}
+\fi
+\unless\ifnum\bxjs@everyparhook=\bxjs@everyparhook@none
+\begingroup
+  \let\%\@percentchar \def\@#1{[[\detokenize{#1}]]}
+  \@gobble\if\def\bxjs@tmpa{\@{\everypar{}\fi}}
+  \ifnum\bxjs@everyparhook=\bxjs@everyparhook@compat
+    \@gobble\if\def\bxjs@tmpa{\@{\everypar{\everyparhook}\fi}}\fi
+  \directlua{
+    local function patchcmd(cs, code, from, to)
+      tex.sprint(code:gsub(from:gsub("\%W", "\%\%\%0"), "\%0"..to)
+        :gsub("macro:", \@\gdef..cs, 1):gsub("->", "{", 1).."}")
+    end
+    patchcmd(\@\@xsect, [[\meaning\@xsect]],
+      \@{\hskip-\@tempskipa}, \@\ltjfakeparbegin)
+    patchcmd(\@\@item, [[\meaning\@item]],
+      \bxjs@tmpa, \@\ltjfakeparbegin)}
+\endgroup
+\fi
 \ifbxjs@hyperref@enc
-  \bxjs@fix@hyperref@unicode{true}
+  \PassOptionsToPackage{unicode}{hyperref}
+  \bxjs@check@hyperref@unicode{true}
 \fi
 \protected\def\autospacing{%
   \ltjsetparameter{autospacing=true}}
@@ -552,11 +595,9 @@
   \ltjsetparameter{xkanjiskip={\@tempskipa}}}
 \def\bxjs@jachar#1{%
   \ltjjachar`#1\relax}
-\ifbxjs@xkanjiskip@cmd
-  \protected\def\>{%
-    \relax\ifmmode \mskip\medmuskip
-    \else \hskip\ltjgetparameter{xkanjiskip}\ignorespaces
-    \fi}
+\ifbxjs@jaspace@cmd
+  \protected\def\jathinspace{%
+    \hskip\ltjgetparameter{xkanjiskip}\relax}
 \fi
 \ifx f\bxjs@enablejfam
   \ClassWarningNoLine\bxjs@clsname
@@ -572,6 +613,16 @@
   \DeclareJaMathFontCommand{\mathmc}{\mcfamily}
   \DeclareJaMathFontCommand{\mathgt}{\gtfamily}
 \fi
+\ifbxjs@jaspace@cmd
+  \bxjs@protected\def\bxjs@choice@jathinspace{%
+    \relax\ifmmode \mskip\medmuskip
+    \else \jathinspace\ignorespaces
+    \fi}
+  \jsAtEndOfClass{%
+    \ifjsWitheTeX \let\>\bxjs@choice@jathinspace
+    \else \def\>{\protect\bxjs@choice@jathinspace}%
+    \fi}
+\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/bxjspandoc.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
index 914ac949ec9..46cb8f33c87 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/09/24 v1.6a BXJS document classes]
+  [2017/10/21 v1.7 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 de3554ba617..512d7ec0b15 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/09/24 v1.6a BXJS document classes]
+  [2017/10/21 v1.7 BXJS document classes]
 %% このファイルは日本語文字を含みます.
 \def\bxjs@clsname{bxjsreport}
 \newif\ifjsc@needsp@tch
@@ -549,14 +549,27 @@
 \let\bxjs@kv@wholezwlines@true\bxjs@whole@zw@linestrue
 \let\bxjs@kv@wholezwlines@false\bxjs@whole@zw@linesfalse
 \define@key{bxjs}{whole-zw-lines}[true]{\bxjs@set@keyval{wholezwlines}{#1}{}}
-\newif\ifbxjs@xkanjiskip@cmd \bxjs@xkanjiskip@cmdtrue
-\let\bxjs@kv@xkanjiskipcmd@true\bxjs@xkanjiskip@cmdtrue
-\let\bxjs@kv@xkanjiskipcmd@false\bxjs@xkanjiskip@cmdfalse
-\define@key{bxjs}{xkanjiskip-cmd}[true]{\bxjs@set@keyval{xkanjiskipcmd}{#1}{}}
+\newif\ifbxjs@jaspace@cmd \bxjs@jaspace@cmdtrue
+\let\bxjs@kv@jaspacecmd@true\bxjs@jaspace@cmdtrue
+\let\bxjs@kv@jaspacecmd@false\bxjs@jaspace@cmdfalse
+\define@key{bxjs}{jaspace-cmd}[true]{\bxjs@set@keyval{jaspacecmd}{#1}{}}
+\define@key{bxjs}{xkanjiskip-cmd}[true]{\bxjs@set@keyval{jaspacecmd}{#1}{}}
 \newif\ifbxjs@hyperref@enc \bxjs@hyperref@enctrue
 \let\bxjs@kv@hyperrefenc@true\bxjs@hyperref@enctrue
 \let\bxjs@kv@hyperrefenc@false\bxjs@hyperref@encfalse
 \define@key{bxjs}{hyperref-enc}[true]{\bxjs@set@keyval{hyperrefenc}{#1}{}}
+\chardef\bxjs@everyparhook@none=0
+\chardef\bxjs@everyparhook@compat=1
+\chardef\bxjs@everyparhook@modern=2
+\if j\jsEngine
+  \let\bxjs@everyparhook\bxjs@everyparhook@compat
+\else
+  \let\bxjs@everyparhook\bxjs@everyparhook@modern
+\fi
+\def\bxjs@kv@everyparhook@none{\let\bxjs@everyparhook\bxjs@everyparhook@none}
+\def\bxjs@kv@everyparhook@compat{\let\bxjs@everyparhook\bxjs@everyparhook@compat}
+\def\bxjs@kv@everyparhook@modern{\let\bxjs@everyparhook\bxjs@everyparhook@modern}
+\define@key{bxjs}{everyparhook}{\bxjs@set@keyval{everyparhook}{#1}{}}
 \let\bxjs@ltx@removeelement\@removeelement
 \def\@removeelement#1#2#3{%
   \def\reserved@a{#2}%
@@ -1332,6 +1345,10 @@
   \@ifstar
     {\@ssect{#3}{#4}{#5}{#6}}%
     {\@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}}
+\ifnum\bxjs@everyparhook=\bxjs@everyparhook@compat
+  \let\bxjs@if@ceph\@firstofone
+\else \let\bxjs@if@ceph\@gobble
+\fi
 \def\@sect#1#2#3#4#5#6[#7]#8{%
   \ifnum #2>\c@secnumdepth
     \let\@svsec\@empty
@@ -1379,11 +1396,10 @@
         \unskip
         \@tempskipa #1\relax
         \hskip -\@tempskipa
-        \bxjs@ltj@inhibitglue
       \else
         \clubpenalty \@clubpenalty
-        \everypar{\everyparhook}%
-      \fi\everyparhook}%
+        \everypar\expandafter{\bxjs@if@ceph\everyparhook}%
+      \fi\bxjs@if@ceph\everyparhook}%
   \else
     \par \nobreak
     \vskip \@tempskipa
@@ -1408,7 +1424,6 @@
     \endgroup
   \fi
   \@xsect{#3}}
-\let\bxjs@ltj@inhibitglue\@empty
 \newcommand*\chaptermark[1]{}
 \setcounter{secnumdepth}{2}
 \newcounter{part}
@@ -2126,7 +2141,10 @@
   \llap{\@makefnmark\hskip0.3\jsZw}#1}
 \let\jsInhibitGlueAtParTop\@empty
 \def\everyparhook{\jsInhibitGlueAtParTop}
+\ifnum\bxjs@everyparhook=\bxjs@everyparhook@compat
 \AtBeginDocument{\everypar{\everyparhook}}
+\fi
+\ifx j\jsEngine
 \def\@inhibitglue{%
   \futurelet\@let@token\@@inhibitglue}
 \begingroup
@@ -2154,6 +2172,8 @@
       \inhibitglue
     \fi
   \fi}
+\fi
+\ifnum\bxjs@everyparhook=\bxjs@everyparhook@compat
 \def\@doendpe{%
   \@endpetrue
   \def\par{%
@@ -2206,7 +2226,6 @@
       \clubpenalty \@clubpenalty
       \everypar{\everyparhook}%
     \fi
-    \bxjs@ltj@inhibitglue
     \everyparhook}%
   \if@noitemarg
     \@noitemargfalse
@@ -2240,6 +2259,9 @@
       \clubpenalty \@clubpenalty
       \everypar{\everyparhook}%
     \fi\everyparhook}}
+\fi
+\ifnum\bxjs@everyparhook=\bxjs@everyparhook@none\else
+\AtEndOfPackage{%
 \def\@gnewline #1{%
   \ifvmode
     \@nolnerr
@@ -2247,6 +2269,8 @@
     \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
     \jsInhibitGlue \ignorespaces
   \fi}
+}
+\fi
 \if@jslogo
   \IfFileExists{jslogo.sty}{%
     \RequirePackage{jslogo}%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
index 72d6b301fd9..3227f3b19ee 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/09/24 v1.6a BXJS document classes]
+  [2017/10/21 v1.7 BXJS document classes]
 %% このファイルは日本語文字を含みます.
 \def\bxjs@clsname{bxjsslide}
 \newif\ifjsc@needsp@tch
@@ -541,14 +541,27 @@
 \let\bxjs@kv@wholezwlines@true\bxjs@whole@zw@linestrue
 \let\bxjs@kv@wholezwlines@false\bxjs@whole@zw@linesfalse
 \define@key{bxjs}{whole-zw-lines}[true]{\bxjs@set@keyval{wholezwlines}{#1}{}}
-\newif\ifbxjs@xkanjiskip@cmd \bxjs@xkanjiskip@cmdtrue
-\let\bxjs@kv@xkanjiskipcmd@true\bxjs@xkanjiskip@cmdtrue
-\let\bxjs@kv@xkanjiskipcmd@false\bxjs@xkanjiskip@cmdfalse
-\define@key{bxjs}{xkanjiskip-cmd}[true]{\bxjs@set@keyval{xkanjiskipcmd}{#1}{}}
+\newif\ifbxjs@jaspace@cmd \bxjs@jaspace@cmdtrue
+\let\bxjs@kv@jaspacecmd@true\bxjs@jaspace@cmdtrue
+\let\bxjs@kv@jaspacecmd@false\bxjs@jaspace@cmdfalse
+\define@key{bxjs}{jaspace-cmd}[true]{\bxjs@set@keyval{jaspacecmd}{#1}{}}
+\define@key{bxjs}{xkanjiskip-cmd}[true]{\bxjs@set@keyval{jaspacecmd}{#1}{}}
 \newif\ifbxjs@hyperref@enc \bxjs@hyperref@enctrue
 \let\bxjs@kv@hyperrefenc@true\bxjs@hyperref@enctrue
 \let\bxjs@kv@hyperrefenc@false\bxjs@hyperref@encfalse
 \define@key{bxjs}{hyperref-enc}[true]{\bxjs@set@keyval{hyperrefenc}{#1}{}}
+\chardef\bxjs@everyparhook@none=0
+\chardef\bxjs@everyparhook@compat=1
+\chardef\bxjs@everyparhook@modern=2
+\if j\jsEngine
+  \let\bxjs@everyparhook\bxjs@everyparhook@compat
+\else
+  \let\bxjs@everyparhook\bxjs@everyparhook@modern
+\fi
+\def\bxjs@kv@everyparhook@none{\let\bxjs@everyparhook\bxjs@everyparhook@none}
+\def\bxjs@kv@everyparhook@compat{\let\bxjs@everyparhook\bxjs@everyparhook@compat}
+\def\bxjs@kv@everyparhook@modern{\let\bxjs@everyparhook\bxjs@everyparhook@modern}
+\define@key{bxjs}{everyparhook}{\bxjs@set@keyval{everyparhook}{#1}{}}
 \let\bxjs@ltx@removeelement\@removeelement
 \def\@removeelement#1#2#3{%
   \def\reserved@a{#2}%
@@ -1321,6 +1334,10 @@
   \@ifstar
     {\@ssect{#3}{#4}{#5}{#6}}%
     {\@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}}
+\ifnum\bxjs@everyparhook=\bxjs@everyparhook@compat
+  \let\bxjs@if@ceph\@firstofone
+\else \let\bxjs@if@ceph\@gobble
+\fi
 \def\@sect#1#2#3#4#5#6[#7]#8{%
   \ifnum #2>\c@secnumdepth
     \let\@svsec\@empty
@@ -1368,11 +1385,10 @@
         \unskip
         \@tempskipa #1\relax
         \hskip -\@tempskipa
-        \bxjs@ltj@inhibitglue
       \else
         \clubpenalty \@clubpenalty
-        \everypar{\everyparhook}%
-      \fi\everyparhook}%
+        \everypar\expandafter{\bxjs@if@ceph\everyparhook}%
+      \fi\bxjs@if@ceph\everyparhook}%
   \else
     \par \nobreak
     \vskip \@tempskipa
@@ -1397,7 +1413,6 @@
     \endgroup
   \fi
   \@xsect{#3}}
-\let\bxjs@ltj@inhibitglue\@empty
 \newcommand*\chaptermark[1]{}
 \setcounter{secnumdepth}{3}
 \newcounter{part}
@@ -1987,7 +2002,10 @@
   \llap{\@makefnmark\hskip0.3\jsZw}#1}
 \let\jsInhibitGlueAtParTop\@empty
 \def\everyparhook{\jsInhibitGlueAtParTop}
+\ifnum\bxjs@everyparhook=\bxjs@everyparhook@compat
 \AtBeginDocument{\everypar{\everyparhook}}
+\fi
+\ifx j\jsEngine
 \def\@inhibitglue{%
   \futurelet\@let@token\@@inhibitglue}
 \begingroup
@@ -2015,6 +2033,8 @@
       \inhibitglue
     \fi
   \fi}
+\fi
+\ifnum\bxjs@everyparhook=\bxjs@everyparhook@compat
 \def\@doendpe{%
   \@endpetrue
   \def\par{%
@@ -2067,7 +2087,6 @@
       \clubpenalty \@clubpenalty
       \everypar{\everyparhook}%
     \fi
-    \bxjs@ltj@inhibitglue
     \everyparhook}%
   \if@noitemarg
     \@noitemargfalse
@@ -2101,6 +2120,9 @@
       \clubpenalty \@clubpenalty
       \everypar{\everyparhook}%
     \fi\everyparhook}}
+\fi
+\ifnum\bxjs@everyparhook=\bxjs@everyparhook@none\else
+\AtEndOfPackage{%
 \def\@gnewline #1{%
   \ifvmode
     \@nolnerr
@@ -2108,6 +2130,8 @@
     \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
     \jsInhibitGlue \ignorespaces
   \fi}
+}
+\fi
 \if@jslogo
   \IfFileExists{jslogo.sty}{%
     \RequirePackage{jslogo}%