summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/bxjscls/README-ja.md2
-rw-r--r--Master/texmf-dist/doc/latex/bxjscls/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdfbin374608 -> 374725 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex4
-rw-r--r--Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdfbin1164383 -> 1165015 bytes
-rw-r--r--Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx41
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls18
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls18
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def12
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls18
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls18
17 files changed, 111 insertions, 34 deletions
diff --git a/Master/texmf-dist/doc/latex/bxjscls/README-ja.md b/Master/texmf-dist/doc/latex/bxjscls/README-ja.md
index 7876dcddfdb..64a1ca59bfd 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/README-ja.md
+++ b/Master/texmf-dist/doc/latex/bxjscls/README-ja.md
@@ -99,6 +99,8 @@ XeLaTeX / LuaLaTeX の上でも日本語処理パッケージと連携して使
更新履歴
--------
+ * Version 2.2b 〈2020/09/29〉
+ - LaTeX カーネル 2020/10/01 版への対応。
* Version 2.2a 〈2020/09/22〉
- バグ修正。
* Version 2.2 〈2020/09/04〉
diff --git a/Master/texmf-dist/doc/latex/bxjscls/README.md b/Master/texmf-dist/doc/latex/bxjscls/README.md
index bbd28f778b0..b0c8a2ba888 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/README.md
+++ b/Master/texmf-dist/doc/latex/bxjscls/README.md
@@ -89,6 +89,8 @@ This package is distributed under the BSD 2-Clause License.
Revision History
----------------
+ * Version 2.2b 〈2020/09/29〉
+ - Support LaTeX kernel 2020/10/01.
* Version 2.2a 〈2020/09/22〉
* Version 2.2 〈2020/09/04〉
* Version 2.1 〈2020/05/28〉
diff --git a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf
index 007f05ce528..12f97477cc9 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf
+++ b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex
index ab00c6ea40e..0e96c93bd7b 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex
+++ b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex
@@ -11,8 +11,8 @@
\bxtexlogoimport{*}
\usepackage{shortvrb}
\MakeShortVerb{\|}
-\newcommand{\PkgVersion}{2.2a}
-\newcommand{\PkgDate}{2020/09/22}
+\newcommand{\PkgVersion}{2.2b}
+\newcommand{\PkgDate}{2020/09/29}
\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 7a5fca81e45..35e512da139 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf
+++ b/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx b/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx
index 84ea99b5496..5d3a66f964a 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>
- [2020/09/22 v2.2a BXJS document classes]
+ [2020/09/29 v2.2b BXJS document classes]
+% [2020/09/22 v2.2a BXJS document classes]
% [2020/09/04 v2.2 BXJS document classes]
% [2020/05/28 v2.1 BXJS document classes]
% [2020/04/04 v2.0a BXJS document classes]
@@ -3488,6 +3489,17 @@
% \paragraph{geometry パッケージを読み込む \ZRX}
% \mbox{}
% \begin{ZRnote}
+% ムニャムニャ。
+% \begin{macrocode}
+\def\bxjs@geometry@name{geometry}
+\ifx\AddToHook\@undefined
+ \let\bxjs@apply@bd@pre@geometry@hook\AtBeginDocument
+\else
+ \def\bxjs@apply@bd@pre@geometry@hook{%
+ \AddToHook{begindocument}[\bxjs@geometry@name]}
+\fi
+% \end{macrocode}
+%
% |geoemtry=class| の場合に、実際に |geometry| パッケージを読みこむ。
% \begin{macrocode}
\ifx\bxjs@geometry\bxjs@geometry@class
@@ -3516,13 +3528,14 @@
% \Note |geometry| のbegin-documentフックにおいて、Lua{\TeX}の
% 旧版互換を有効にする。
% \begin{macrocode}
-\AtBeginDocument{\bxjs@bd@pre@geometry@hook}
-\AtBeginDocument{\ImposeOldLuaTeXBehavior}
+\bxjs@apply@bd@pre@geometry@hook
+\bxjs@apply@bd@pre@geometry@hook{\bxjs@bd@pre@geometry@hook}
+\bxjs@apply@bd@pre@geometry@hook{\ImposeOldLuaTeXBehavior}
\bxjs@preproc@layout
\edef\bxjs@next{%
\noexpand\RequirePackage[\bxjs@layout@paper,\bxjs@layout]{geometry}%
}\bxjs@next
-\AtBeginDocument{\RevokeOldLuaTeXBehavior}
+\bxjs@apply@bd@pre@geometry@hook{\RevokeOldLuaTeXBehavior}
% \end{macrocode}
%
% \begin{macro}{\bxjs@geometry@driver}
@@ -4562,7 +4575,7 @@
% |\title| にフックを入れる。
% \begin{macrocode}
\renewcommand*{\title}[1]{\bxjs@decl@subtitle\gdef\@title{#1}}
-\AtBeginDocument{\bxjs@decl@subtitle}
+\g@addto@macro\bxjs@begin@document@hook{\bxjs@decl@subtitle}
\def\bxjs@decl@subtitle{%
\global\let\bxjs@decl@subtitle\relax
\ifx\subtitle\@undefined
@@ -9525,6 +9538,12 @@
% DVIのなるべく早い位置にspecialを出力する。
% \begin{macrocode}
\@onlypreamble\bxjs@urgent@special
+\@onlypreamble\bxjs@urgent@special@a
+% \end{macrocode}
+% {\LaTeX}カーネルの新フック管理が導入済かを調べる。
+% 未導入の古い版である場合。
+% \begin{macrocode}
+\ifx\AddToHook\@undefined
\def\bxjs@urgent@special#1{%
\AtBeginDvi{\special{#1}}%
\g@addto@macro\bxjs@begin@document@hook{%
@@ -9538,6 +9557,18 @@
}%
}
% \end{macrocode}
+% 導入済の場合。
+% \Note 自分が先行する必要がある対象のパッケージを適宜追加する。
+% \begin{macrocode}
+\else
+ \def\bxjs@urgent@special#1{%
+ \bxjs@urgent@special@a
+ \AddToHook{shipout/firstpage}[./urgent]{\special{#1}}}
+ \def\bxjs@urgent@special@a{%
+ \DeclareHookRule{shipout/firstpage}{./urgent}{<}{hyperref}%
+ \global\let\bxjs@urgent@special@a\relax}
+\fi
+% \end{macrocode}
% \end{macro}
%
%^^A----------------
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
index 3d30784030c..2771150a08f 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}
- [2020/09/22 v2.2a BXJS document classes]
+ [2020/09/29 v2.2b BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsarticle}
\newif\ifjsc@needsp@tch
@@ -1149,6 +1149,13 @@
}
\edef\jsGeometryOptions{%
\bxjs@layout@paper,\bxjs@layout}
+\def\bxjs@geometry@name{geometry}
+\ifx\AddToHook\@undefined
+ \let\bxjs@apply@bd@pre@geometry@hook\AtBeginDocument
+\else
+ \def\bxjs@apply@bd@pre@geometry@hook{%
+ \AddToHook{begindocument}[\bxjs@geometry@name]}
+\fi
\ifx\bxjs@geometry\bxjs@geometry@class
\ifbxjs@papersize
\ifx\bxjs@driver@given\bxjs@driver@@dvipdfmx
@@ -1160,13 +1167,14 @@
\else
\PassOptionsToPackage{driver=none}{geometry}
\fi
-\AtBeginDocument{\bxjs@bd@pre@geometry@hook}
-\AtBeginDocument{\ImposeOldLuaTeXBehavior}
+\bxjs@apply@bd@pre@geometry@hook
+\bxjs@apply@bd@pre@geometry@hook{\bxjs@bd@pre@geometry@hook}
+\bxjs@apply@bd@pre@geometry@hook{\ImposeOldLuaTeXBehavior}
\bxjs@preproc@layout
\edef\bxjs@next{%
\noexpand\RequirePackage[\bxjs@layout@paper,\bxjs@layout]{geometry}%
}\bxjs@next
-\AtBeginDocument{\RevokeOldLuaTeXBehavior}
+\bxjs@apply@bd@pre@geometry@hook{\RevokeOldLuaTeXBehavior}
\let\bxjs@geometry@driver\Gm@driver
\bxjs@postproc@layout
\g@addto@macro\bxjs@bd@pre@geometry@hook{%
@@ -1310,7 +1318,7 @@
}
\newcommand*{\jsSubtitle}[1]{\gdef\bxjs@subtitle{#1}}
\renewcommand*{\title}[1]{\bxjs@decl@subtitle\gdef\@title{#1}}
-\AtBeginDocument{\bxjs@decl@subtitle}
+\g@addto@macro\bxjs@begin@document@hook{\bxjs@decl@subtitle}
\def\bxjs@decl@subtitle{%
\global\let\bxjs@decl@subtitle\relax
\ifx\subtitle\@undefined
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
index 6cdf4c2d0fa..9b05a81dca0 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}
- [2020/09/22 v2.2a BXJS document classes]
+ [2020/09/29 v2.2b BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsbook}
\newif\ifjsc@needsp@tch
@@ -1183,6 +1183,13 @@
}
\edef\jsGeometryOptions{%
\bxjs@layout@paper,\bxjs@layout}
+\def\bxjs@geometry@name{geometry}
+\ifx\AddToHook\@undefined
+ \let\bxjs@apply@bd@pre@geometry@hook\AtBeginDocument
+\else
+ \def\bxjs@apply@bd@pre@geometry@hook{%
+ \AddToHook{begindocument}[\bxjs@geometry@name]}
+\fi
\ifx\bxjs@geometry\bxjs@geometry@class
\ifbxjs@papersize
\ifx\bxjs@driver@given\bxjs@driver@@dvipdfmx
@@ -1194,13 +1201,14 @@
\else
\PassOptionsToPackage{driver=none}{geometry}
\fi
-\AtBeginDocument{\bxjs@bd@pre@geometry@hook}
-\AtBeginDocument{\ImposeOldLuaTeXBehavior}
+\bxjs@apply@bd@pre@geometry@hook
+\bxjs@apply@bd@pre@geometry@hook{\bxjs@bd@pre@geometry@hook}
+\bxjs@apply@bd@pre@geometry@hook{\ImposeOldLuaTeXBehavior}
\bxjs@preproc@layout
\edef\bxjs@next{%
\noexpand\RequirePackage[\bxjs@layout@paper,\bxjs@layout]{geometry}%
}\bxjs@next
-\AtBeginDocument{\RevokeOldLuaTeXBehavior}
+\bxjs@apply@bd@pre@geometry@hook{\RevokeOldLuaTeXBehavior}
\let\bxjs@geometry@driver\Gm@driver
\bxjs@postproc@layout
\g@addto@macro\bxjs@bd@pre@geometry@hook{%
@@ -1346,7 +1354,7 @@
}
\newcommand*{\jsSubtitle}[1]{\gdef\bxjs@subtitle{#1}}
\renewcommand*{\title}[1]{\bxjs@decl@subtitle\gdef\@title{#1}}
-\AtBeginDocument{\bxjs@decl@subtitle}
+\g@addto@macro\bxjs@begin@document@hook{\bxjs@decl@subtitle}
\def\bxjs@decl@subtitle{%
\global\let\bxjs@decl@subtitle\relax
\ifx\subtitle\@undefined
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
index 39657dcdbda..9d07a93ef9a 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}
- [2020/09/22 v2.2a BXJS document classes]
+ [2020/09/29 v2.2b 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 53912d7f75f..fd6fa684d88 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}
- [2020/09/22 v2.2a BXJS document classes]
+ [2020/09/29 v2.2b 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 452659494f3..1f564f06e3f 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}
- [2020/09/22 v2.2a BXJS document classes]
+ [2020/09/29 v2.2b 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 dc13addd2a4..3cc8e792b0c 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}
- [2020/09/22 v2.2a BXJS document classes]
+ [2020/09/29 v2.2b 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 7752b66606d..050bc691603 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}
- [2020/09/22 v2.2a BXJS document classes]
+ [2020/09/29 v2.2b BXJS document classes]
\input{bxjsja-standard.def}
\RequirePackage{bxjspandoc}
\@onlypreamble\bxjs@endpreamble@hook
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
index 4cf657f5175..7670dc91860 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}
- [2020/09/22 v2.2a BXJS document classes]
+ [2020/09/29 v2.2b BXJS document classes]
%% このファイルは日本語文字を含みます
\input{bxjsja-minimal.def}
\bxjs@simplejasetupfalse
@@ -291,6 +291,8 @@
{\@ehc}%
\fi}}
\@onlypreamble\bxjs@urgent@special
+\@onlypreamble\bxjs@urgent@special@a
+\ifx\AddToHook\@undefined
\def\bxjs@urgent@special#1{%
\AtBeginDvi{\special{#1}}%
\g@addto@macro\bxjs@begin@document@hook{%
@@ -303,6 +305,14 @@
}{}%
}%
}
+\else
+ \def\bxjs@urgent@special#1{%
+ \bxjs@urgent@special@a
+ \AddToHook{shipout/firstpage}[./urgent]{\special{#1}}}
+ \def\bxjs@urgent@special@a{%
+ \DeclareHookRule{shipout/firstpage}{./urgent}{<}{hyperref}%
+ \global\let\bxjs@urgent@special@a\relax}
+\fi
\if j\jsEngine
\def\bxjs@apply@kanjiskip{%
\kanjiskip\@tempskipa}
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
index 56dfefc50b6..8c14f4e8da9 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}
- [2020/09/22 v2.2a BXJS document classes]
+ [2020/09/29 v2.2b 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 80d83d1a798..ef2f4f08e9c 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}
- [2020/09/22 v2.2a BXJS document classes]
+ [2020/09/29 v2.2b BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsreport}
\newif\ifjsc@needsp@tch
@@ -1157,6 +1157,13 @@
}
\edef\jsGeometryOptions{%
\bxjs@layout@paper,\bxjs@layout}
+\def\bxjs@geometry@name{geometry}
+\ifx\AddToHook\@undefined
+ \let\bxjs@apply@bd@pre@geometry@hook\AtBeginDocument
+\else
+ \def\bxjs@apply@bd@pre@geometry@hook{%
+ \AddToHook{begindocument}[\bxjs@geometry@name]}
+\fi
\ifx\bxjs@geometry\bxjs@geometry@class
\ifbxjs@papersize
\ifx\bxjs@driver@given\bxjs@driver@@dvipdfmx
@@ -1168,13 +1175,14 @@
\else
\PassOptionsToPackage{driver=none}{geometry}
\fi
-\AtBeginDocument{\bxjs@bd@pre@geometry@hook}
-\AtBeginDocument{\ImposeOldLuaTeXBehavior}
+\bxjs@apply@bd@pre@geometry@hook
+\bxjs@apply@bd@pre@geometry@hook{\bxjs@bd@pre@geometry@hook}
+\bxjs@apply@bd@pre@geometry@hook{\ImposeOldLuaTeXBehavior}
\bxjs@preproc@layout
\edef\bxjs@next{%
\noexpand\RequirePackage[\bxjs@layout@paper,\bxjs@layout]{geometry}%
}\bxjs@next
-\AtBeginDocument{\RevokeOldLuaTeXBehavior}
+\bxjs@apply@bd@pre@geometry@hook{\RevokeOldLuaTeXBehavior}
\let\bxjs@geometry@driver\Gm@driver
\bxjs@postproc@layout
\g@addto@macro\bxjs@bd@pre@geometry@hook{%
@@ -1320,7 +1328,7 @@
}
\newcommand*{\jsSubtitle}[1]{\gdef\bxjs@subtitle{#1}}
\renewcommand*{\title}[1]{\bxjs@decl@subtitle\gdef\@title{#1}}
-\AtBeginDocument{\bxjs@decl@subtitle}
+\g@addto@macro\bxjs@begin@document@hook{\bxjs@decl@subtitle}
\def\bxjs@decl@subtitle{%
\global\let\bxjs@decl@subtitle\relax
\ifx\subtitle\@undefined
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
index 3a1ef1be2b8..57e35dea8f5 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}
- [2020/09/22 v2.2a BXJS document classes]
+ [2020/09/29 v2.2b BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsslide}
\newif\ifjsc@needsp@tch
@@ -1147,6 +1147,13 @@
}
\edef\jsGeometryOptions{%
\bxjs@layout@paper,\bxjs@layout}
+\def\bxjs@geometry@name{geometry}
+\ifx\AddToHook\@undefined
+ \let\bxjs@apply@bd@pre@geometry@hook\AtBeginDocument
+\else
+ \def\bxjs@apply@bd@pre@geometry@hook{%
+ \AddToHook{begindocument}[\bxjs@geometry@name]}
+\fi
\ifx\bxjs@geometry\bxjs@geometry@class
\ifbxjs@papersize
\ifx\bxjs@driver@given\bxjs@driver@@dvipdfmx
@@ -1158,13 +1165,14 @@
\else
\PassOptionsToPackage{driver=none}{geometry}
\fi
-\AtBeginDocument{\bxjs@bd@pre@geometry@hook}
-\AtBeginDocument{\ImposeOldLuaTeXBehavior}
+\bxjs@apply@bd@pre@geometry@hook
+\bxjs@apply@bd@pre@geometry@hook{\bxjs@bd@pre@geometry@hook}
+\bxjs@apply@bd@pre@geometry@hook{\ImposeOldLuaTeXBehavior}
\bxjs@preproc@layout
\edef\bxjs@next{%
\noexpand\RequirePackage[\bxjs@layout@paper,\bxjs@layout]{geometry}%
}\bxjs@next
-\AtBeginDocument{\RevokeOldLuaTeXBehavior}
+\bxjs@apply@bd@pre@geometry@hook{\RevokeOldLuaTeXBehavior}
\let\bxjs@geometry@driver\Gm@driver
\bxjs@postproc@layout
\g@addto@macro\bxjs@bd@pre@geometry@hook{%
@@ -1308,7 +1316,7 @@
}
\newcommand*{\jsSubtitle}[1]{\gdef\bxjs@subtitle{#1}}
\renewcommand*{\title}[1]{\bxjs@decl@subtitle\gdef\@title{#1}}
-\AtBeginDocument{\bxjs@decl@subtitle}
+\g@addto@macro\bxjs@begin@document@hook{\bxjs@decl@subtitle}
\def\bxjs@decl@subtitle{%
\global\let\bxjs@decl@subtitle\relax
\ifx\subtitle\@undefined