bxjscls (23aug18)

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

1 files changed, 25 insertions, 3 deletions

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}
 %