bxjscls (23aug18)

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

17 files changed, 60 insertions, 18 deletions

diff --git a/Master/texmf-dist/doc/latex/bxjscls/README-ja.md b/Master/texmf-dist/doc/latex/bxjscls/README-ja.md
index 64cd6d8d1d9..2611ca7d366 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/README-ja.md
+++ b/Master/texmf-dist/doc/latex/bxjscls/README-ja.md
@@ -98,6 +98,8 @@ XeLaTeX / LuaLaTeX の上でも日本語処理パッケージと連携して使�
 更新履歴
 --------
 
+  * Version 1.9b 〈2018/08/20〉
+      - バグ修正。
   * Version 1.9a 〈2018/07/20〉
       - jsclasses の 2018/06/23 と同期。
           + `\jsTocLine` を新設。
diff --git a/Master/texmf-dist/doc/latex/bxjscls/README.md b/Master/texmf-dist/doc/latex/bxjscls/README.md
index de9c74ef2be..3a50f222815 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/README.md
+++ b/Master/texmf-dist/doc/latex/bxjscls/README.md
@@ -88,6 +88,7 @@ This package is distributed under the BSD 2-Clause License.
 Revision History
 ----------------
 
+  * Version 1.9b 〈2018/08/20〉
   * Version 1.9a 〈2018/07/20〉
       - Sync with jsclasses 2018/06/23.
   * Version 1.9  〈2018/04/19〉
diff --git a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf
index 37b93ca653a..fd969800f05 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf
+++ b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf
diff --git a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex
index 0cdc79a1ff7..b88fcef7998 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex
+++ b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex
@@ -12,8 +12,8 @@
   \renewcommand*{\XeLaTeX}{XeLaTeX}}
 \usepackage{shortvrb}
 \MakeShortVerb{\|}
-\newcommand{\PkgVersion}{v1.9a}
-\newcommand{\PkgDate}{2018/07/20}
+\newcommand{\PkgVersion}{v1.9b}
+\newcommand{\PkgDate}{2018/08/20}
 \newcommand{\Pkg}[1]{\textsf{#1}}
 \newcommand{\Meta}[1]{$\langle$\mbox{}\nobr#1\nobr\mbox{}$\rangle$}
 \newcommand{\Note}{\par\noindent ※}
diff --git a/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf b/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf
index 31b4399b6ac..7d7ab756654 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf
+++ b/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf
diff --git a/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx b/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx
index 795263a4357..a23a8651a9a 100644
--- a/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx
+++ b/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx
@@ -56,7 +56,8 @@
 %<*driver>
 \ProvidesFile{bxjscls.dtx}
 %</driver>
-  [2018/07/20 v1.9a BXJS document classes]
+  [2018/08/20 v1.9b BXJS document classes]
+% [2018/07/20 v1.9a BXJS document classes]
 % based on jsclasses [2018/06/23]
 % [2018/04/19 v1.9  BXJS document classes]
 % [2018/04/14 v1.8b BXJS document classes]
@@ -10193,6 +10194,16 @@
 \RequirePackage{bxjspandoc}
 %    \end{macrocode}
 %
+% |etoolbox| の |\AtEndPreamble| のフックを用意する。
+%    \begin{macrocode}
+\@onlypreamble\bxjs@endpreamble@hook
+\let\bxjs@endpreamble@hook\@empty
+\ifjsWitheTeX
+  \RequirePackage{etoolbox}[2010/08/21]% v2.0
+  \AtEndPreamble{\bxjs@endpreamble@hook}
+\fi
+%    \end{macrocode}
+%
 %^^A----------------
 %\subsection{duploadシステム}
 %
@@ -10249,6 +10260,7 @@
 % これを防ぐため、とりあえず両パッケージを無効化しておく。
 %
 %    \begin{macrocode}
+\newif\ifbxjs@lang@exists
 \ifnum0\if x\jsEngine1\fi\if l\jsEngine1\fi>0
 %    \end{macrocode}
 % Polyglossiaについて。
@@ -10256,7 +10268,8 @@
 \pandocSkipLoadPackage{polyglossia}
 \bxjs@set@dupload@proc{polyglossia.sty}{%
   \ClassWarning\bxjs@clsname
-   {Loading of polyglossia is blocked}}
+   {Loading of polyglossia is blocked}%
+  \bxjs@lang@existstrue}
 \ifx\setmainlanguage\@undefined
 \newcommand*\setmainlanguage[2][]{}
 \newcommand*\setotherlanguage[2][]{%
@@ -10269,6 +10282,10 @@
   \@for\bxjs@tmpa:={#2}\do{%
     \setotherlangauge{\bxjs@tmpa}}}
 \fi
+\g@addto@macro\bxjs@endpreamble@hook{%
+  \ifbxjs@lang@exists\else
+    \csundef{ver@polyglossia.sty}%
+  \fi}
 \else
 %    \end{macrocode}
 % Babelについて。
@@ -10276,10 +10293,15 @@
 \pandocSkipLoadPackage{babel}
 \bxjs@set@dupload@proc{babel.sty}{%
   \ClassWarning\bxjs@clsname
-   {Loading of babel is blocked}}
+   {Loading of babel is blocked}%
+  \bxjs@lang@existstrue}
 \let\foreignlanguage\@secondoftwo
 \let\otherlanguage\@gobble
 \let\endotherlanguage\@empty
+\g@addto@macro\bxjs@endpreamble@hook{%
+  \ifbxjs@lang@exists\else
+    \csundef{ver@babel.sty}%
+  \fi}
 \fi
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
index 788a2bef162..d5bffeeafec 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}
-  [2018/07/20 v1.9a BXJS document classes]
+  [2018/08/20 v1.9b BXJS document classes]
 %% このファイルは日本語文字を含みます.
 \def\bxjs@clsname{bxjsarticle}
 \newif\ifjsc@needsp@tch
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
index 467b235921e..0bc74113ab5 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}
-  [2018/07/20 v1.9a BXJS document classes]
+  [2018/08/20 v1.9b BXJS document classes]
 %% このファイルは日本語文字を含みます.
 \def\bxjs@clsname{bxjsbook}
 \newif\ifjsc@needsp@tch
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
index 94edb9cf222..79ef8f926d1 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}
-  [2018/07/20 v1.9a BXJS document classes]
+  [2018/08/20 v1.9b BXJS document classes]
 \def\bxjx@pkgname{bxjscjkcat}
 \newcount\bxjx@cnta
 \@onlypreamble\bxjx@tmpdo
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty
index 478a9a9a857..9d9ca1c8323 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}
-  [2018/07/20 v1.9a BXJS document classes]
+  [2018/08/20 v1.9b 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 655e5b21319..7596dfc41fc 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}
-  [2018/07/20 v1.9a BXJS document classes]
+  [2018/08/20 v1.9b 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 e633450c64c..f37a65ad840 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}
-  [2018/07/20 v1.9a BXJS document classes]
+  [2018/08/20 v1.9b 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 4e783314989..aeea92baf96 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def
@@ -21,9 +21,15 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 \ProvidesFile{bxjsja-pandoc.def}
-  [2018/07/20 v1.9a BXJS document classes]
+  [2018/08/20 v1.9b BXJS document classes]
 \input{bxjsja-standard.def}
 \RequirePackage{bxjspandoc}
+\@onlypreamble\bxjs@endpreamble@hook
+\let\bxjs@endpreamble@hook\@empty
+\ifjsWitheTeX
+  \RequirePackage{etoolbox}[2010/08/21]% v2.0
+  \AtEndPreamble{\bxjs@endpreamble@hook}
+\fi
 \@onlypreamble\bxjs@set@dupload@proc
 \def\bxjs@set@dupload@proc#1{%
   \expandafter\bxjs@set@dupload@proc@a\csname bxjs@dlp/#1\endcsname}
@@ -49,11 +55,13 @@
 \def\bxjs@do@dupload@proc#1#2#3{%
   \csname bxjs@dlp/#2.#1\endcsname{#3}%
   \@firstoftwo}
+\newif\ifbxjs@lang@exists
 \ifnum0\if x\jsEngine1\fi\if l\jsEngine1\fi>0
 \pandocSkipLoadPackage{polyglossia}
 \bxjs@set@dupload@proc{polyglossia.sty}{%
   \ClassWarning\bxjs@clsname
-   {Loading of polyglossia is blocked}}
+   {Loading of polyglossia is blocked}%
+  \bxjs@lang@existstrue}
 \ifx\setmainlanguage\@undefined
 \newcommand*\setmainlanguage[2][]{}
 \newcommand*\setotherlanguage[2][]{%
@@ -66,14 +74,23 @@
   \@for\bxjs@tmpa:={#2}\do{%
     \setotherlangauge{\bxjs@tmpa}}}
 \fi
+\g@addto@macro\bxjs@endpreamble@hook{%
+  \ifbxjs@lang@exists\else
+    \csundef{ver@polyglossia.sty}%
+  \fi}
 \else
 \pandocSkipLoadPackage{babel}
 \bxjs@set@dupload@proc{babel.sty}{%
   \ClassWarning\bxjs@clsname
-   {Loading of babel is blocked}}
+   {Loading of babel is blocked}%
+  \bxjs@lang@existstrue}
 \let\foreignlanguage\@secondoftwo
 \let\otherlanguage\@gobble
 \let\endotherlanguage\@empty
+\g@addto@macro\bxjs@endpreamble@hook{%
+  \ifbxjs@lang@exists\else
+    \csundef{ver@babel.sty}%
+  \fi}
 \fi
 \bxjs@set@dupload@proc{geometry.sty}{%
   \setpagelayout*{#1}}
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
index 0955b211fa1..fff392791d8 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}
-  [2018/07/20 v1.9a BXJS document classes]
+  [2018/08/20 v1.9b BXJS document classes]
 %% このファイルは日本語文字を含みます
 \input{bxjsja-minimal.def}
 \bxjs@simplejasetupfalse
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
index a480e650c25..49a72073128 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}
-  [2018/07/20 v1.9a BXJS document classes]
+  [2018/08/20 v1.9b 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 7ba826af467..7304823a6d2 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}
-  [2018/07/20 v1.9a BXJS document classes]
+  [2018/08/20 v1.9b BXJS document classes]
 %% このファイルは日本語文字を含みます.
 \def\bxjs@clsname{bxjsreport}
 \newif\ifjsc@needsp@tch
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
index d7e7f643d2a..3a687be48ff 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}
-  [2018/07/20 v1.9a BXJS document classes]
+  [2018/08/20 v1.9b BXJS document classes]
 %% このファイルは日本語文字を含みます.
 \def\bxjs@clsname{bxjsslide}
 \newif\ifjsc@needsp@tch