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.md1
-rw-r--r--Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdfbin374725 -> 374721 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex4
-rw-r--r--Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdfbin1165015 -> 1165227 bytes
-rw-r--r--Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx22
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls6
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls6
-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.def8
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls6
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls6
17 files changed, 48 insertions, 25 deletions
diff --git a/Master/texmf-dist/doc/latex/bxjscls/README-ja.md b/Master/texmf-dist/doc/latex/bxjscls/README-ja.md
index 64a1ca59bfd..3a71f43a4cd 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.2c 〈2020/10/04〉
+ - バグ修正。
* Version 2.2b 〈2020/09/29〉
- LaTeX カーネル 2020/10/01 版への対応。
* Version 2.2a 〈2020/09/22〉
diff --git a/Master/texmf-dist/doc/latex/bxjscls/README.md b/Master/texmf-dist/doc/latex/bxjscls/README.md
index b0c8a2ba888..87f717d1d5c 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/README.md
+++ b/Master/texmf-dist/doc/latex/bxjscls/README.md
@@ -89,6 +89,7 @@ This package is distributed under the BSD 2-Clause License.
Revision History
----------------
+ * Version 2.2c 〈2020/10/04〉
* Version 2.2b 〈2020/09/29〉
- Support LaTeX kernel 2020/10/01.
* Version 2.2a 〈2020/09/22〉
diff --git a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf
index 12f97477cc9..1522dd685fd 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 0e96c93bd7b..a93aeede274 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.2b}
-\newcommand{\PkgDate}{2020/09/29}
+\newcommand{\PkgVersion}{2.2c}
+\newcommand{\PkgDate}{2020/10/04}
\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 35e512da139..8a3abf0ea61 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 5d3a66f964a..9d44ced9498 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/29 v2.2b BXJS document classes]
+ [2020/10/04 v2.2c 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]
@@ -480,6 +481,16 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\ifbxjs@old@hook@system}
+% 〔スイッチ〕
+% {\LaTeX}の新しいフック管理システムが未導入であるか。
+% \Note カーネルの2020/10/01版で導入された。
+% \begin{macrocode}
+\newif\ifbxjs@old@hook@system
+\@ifl@t@r\fmtversion{2020/10/01}{}{\bxjs@old@hook@systemtrue}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\bxjs@cond}
% |\bxjs@cond\ifXXX|……|\fi{|\Meta{真}|}{|\Meta{偽}|}|\par
% {\TeX}のif-文(|\ifXXX|……\Meta{真}|\else|\Meta{偽}|\fi|)を
@@ -3492,7 +3503,7 @@
% ムニャムニャ。
% \begin{macrocode}
\def\bxjs@geometry@name{geometry}
-\ifx\AddToHook\@undefined
+\ifbxjs@old@hook@system
\let\bxjs@apply@bd@pre@geometry@hook\AtBeginDocument
\else
\def\bxjs@apply@bd@pre@geometry@hook{%
@@ -9543,7 +9554,7 @@
% {\LaTeX}カーネルの新フック管理が導入済かを調べる。
% 未導入の古い版である場合。
% \begin{macrocode}
-\ifx\AddToHook\@undefined
+\ifbxjs@old@hook@system
\def\bxjs@urgent@special#1{%
\AtBeginDvi{\special{#1}}%
\g@addto@macro\bxjs@begin@document@hook{%
@@ -9559,13 +9570,14 @@
% \end{macrocode}
% 導入済の場合。
% \Note 自分が先行する必要がある対象のパッケージを適宜追加する。
+% \Note |pxjahyper| パッケージの処理と合わせる。
% \begin{macrocode}
\else
\def\bxjs@urgent@special#1{%
\bxjs@urgent@special@a
- \AddToHook{shipout/firstpage}[./urgent]{\special{#1}}}
+ \AddToHook{shipout/firstpage}[pxjahyper/enc]{\special{#1}}}
\def\bxjs@urgent@special@a{%
- \DeclareHookRule{shipout/firstpage}{./urgent}{<}{hyperref}%
+ \DeclareHookRule{shipout/firstpage}{pxjahyper/enc}{<}{hyperref}%
\global\let\bxjs@urgent@special@a\relax}
\fi
% \end{macrocode}
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
index 2771150a08f..99020392510 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/29 v2.2b BXJS document classes]
+ [2020/10/04 v2.2c BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsarticle}
\newif\ifjsc@needsp@tch
@@ -92,6 +92,8 @@
\ifx\bxjs@tmpa\bxjs@tmpb
\bxjs@TUenctrue
\fi
+\newif\ifbxjs@old@hook@system
+\@ifl@t@r\fmtversion{2020/10/01}{}{\bxjs@old@hook@systemtrue}
\@gobbletwo\if\if \def\bxjs@cond#1\fi{%
#1\expandafter\@firstoftwo
\else\expandafter\@secondoftwo
@@ -1150,7 +1152,7 @@
\edef\jsGeometryOptions{%
\bxjs@layout@paper,\bxjs@layout}
\def\bxjs@geometry@name{geometry}
-\ifx\AddToHook\@undefined
+\ifbxjs@old@hook@system
\let\bxjs@apply@bd@pre@geometry@hook\AtBeginDocument
\else
\def\bxjs@apply@bd@pre@geometry@hook{%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
index 9b05a81dca0..18b90488af6 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/29 v2.2b BXJS document classes]
+ [2020/10/04 v2.2c BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsbook}
\newif\ifjsc@needsp@tch
@@ -92,6 +92,8 @@
\ifx\bxjs@tmpa\bxjs@tmpb
\bxjs@TUenctrue
\fi
+\newif\ifbxjs@old@hook@system
+\@ifl@t@r\fmtversion{2020/10/01}{}{\bxjs@old@hook@systemtrue}
\@gobbletwo\if\if \def\bxjs@cond#1\fi{%
#1\expandafter\@firstoftwo
\else\expandafter\@secondoftwo
@@ -1184,7 +1186,7 @@
\edef\jsGeometryOptions{%
\bxjs@layout@paper,\bxjs@layout}
\def\bxjs@geometry@name{geometry}
-\ifx\AddToHook\@undefined
+\ifbxjs@old@hook@system
\let\bxjs@apply@bd@pre@geometry@hook\AtBeginDocument
\else
\def\bxjs@apply@bd@pre@geometry@hook{%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
index 9d07a93ef9a..3c24d340f35 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/29 v2.2b BXJS document classes]
+ [2020/10/04 v2.2c 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 fd6fa684d88..e61104fa7ff 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/29 v2.2b BXJS document classes]
+ [2020/10/04 v2.2c 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 1f564f06e3f..2d808752679 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/29 v2.2b BXJS document classes]
+ [2020/10/04 v2.2c 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 3cc8e792b0c..c8ebee27d80 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/29 v2.2b BXJS document classes]
+ [2020/10/04 v2.2c 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 050bc691603..d52fa76fad2 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/29 v2.2b BXJS document classes]
+ [2020/10/04 v2.2c 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 7670dc91860..24c5537c008 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/29 v2.2b BXJS document classes]
+ [2020/10/04 v2.2c BXJS document classes]
%% このファイルは日本語文字を含みます
\input{bxjsja-minimal.def}
\bxjs@simplejasetupfalse
@@ -292,7 +292,7 @@
\fi}}
\@onlypreamble\bxjs@urgent@special
\@onlypreamble\bxjs@urgent@special@a
-\ifx\AddToHook\@undefined
+\ifbxjs@old@hook@system
\def\bxjs@urgent@special#1{%
\AtBeginDvi{\special{#1}}%
\g@addto@macro\bxjs@begin@document@hook{%
@@ -308,9 +308,9 @@
\else
\def\bxjs@urgent@special#1{%
\bxjs@urgent@special@a
- \AddToHook{shipout/firstpage}[./urgent]{\special{#1}}}
+ \AddToHook{shipout/firstpage}[pxjahyper/enc]{\special{#1}}}
\def\bxjs@urgent@special@a{%
- \DeclareHookRule{shipout/firstpage}{./urgent}{<}{hyperref}%
+ \DeclareHookRule{shipout/firstpage}{pxjahyper/enc}{<}{hyperref}%
\global\let\bxjs@urgent@special@a\relax}
\fi
\if j\jsEngine
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
index 8c14f4e8da9..a367a0c4949 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/29 v2.2b BXJS document classes]
+ [2020/10/04 v2.2c 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 ef2f4f08e9c..5cdc283de6e 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/29 v2.2b BXJS document classes]
+ [2020/10/04 v2.2c BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsreport}
\newif\ifjsc@needsp@tch
@@ -92,6 +92,8 @@
\ifx\bxjs@tmpa\bxjs@tmpb
\bxjs@TUenctrue
\fi
+\newif\ifbxjs@old@hook@system
+\@ifl@t@r\fmtversion{2020/10/01}{}{\bxjs@old@hook@systemtrue}
\@gobbletwo\if\if \def\bxjs@cond#1\fi{%
#1\expandafter\@firstoftwo
\else\expandafter\@secondoftwo
@@ -1158,7 +1160,7 @@
\edef\jsGeometryOptions{%
\bxjs@layout@paper,\bxjs@layout}
\def\bxjs@geometry@name{geometry}
-\ifx\AddToHook\@undefined
+\ifbxjs@old@hook@system
\let\bxjs@apply@bd@pre@geometry@hook\AtBeginDocument
\else
\def\bxjs@apply@bd@pre@geometry@hook{%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
index 57e35dea8f5..63dbc7c0447 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/29 v2.2b BXJS document classes]
+ [2020/10/04 v2.2c BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsslide}
\newif\ifjsc@needsp@tch
@@ -92,6 +92,8 @@
\ifx\bxjs@tmpa\bxjs@tmpb
\bxjs@TUenctrue
\fi
+\newif\ifbxjs@old@hook@system
+\@ifl@t@r\fmtversion{2020/10/01}{}{\bxjs@old@hook@systemtrue}
\@gobbletwo\if\if \def\bxjs@cond#1\fi{%
#1\expandafter\@firstoftwo
\else\expandafter\@secondoftwo
@@ -1148,7 +1150,7 @@
\edef\jsGeometryOptions{%
\bxjs@layout@paper,\bxjs@layout}
\def\bxjs@geometry@name{geometry}
-\ifx\AddToHook\@undefined
+\ifbxjs@old@hook@system
\let\bxjs@apply@bd@pre@geometry@hook\AtBeginDocument
\else
\def\bxjs@apply@bd@pre@geometry@hook{%