From 6252bbe05d6c7516d6361714eacfd384ccae3389 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 5 Oct 2020 20:51:55 +0000 Subject: bxjscls (5oct20) git-svn-id: svn://tug.org/texlive/trunk@56552 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls | 6 ++++-- Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls | 6 ++++-- 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 +- Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def | 8 ++++---- Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls | 6 ++++-- Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls | 6 ++++-- 11 files changed, 26 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/tex') 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{% -- cgit v1.2.3