From fe206fb3eb0df9a1cb538e9dea93dcffae9c034b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 29 Sep 2020 21:24:54 +0000 Subject: bxjscls (29sep20) git-svn-id: svn://tug.org/texlive/trunk@56476 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls | 18 +++++++++++++----- Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls | 18 +++++++++++++----- Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def | 2 +- .../texmf-dist/tex/latex/bxjscls/bxjsja-standard.def | 12 +++++++++++- Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls | 18 +++++++++++++----- Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls | 18 +++++++++++++----- 11 files changed, 69 insertions(+), 27 deletions(-) (limited to 'Master/texmf-dist/tex/latex/bxjscls') 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 -- cgit v1.2.3