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/bxjsslide.cls | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls') 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