From 2ec558d7eabcf796669f115c3481cb80d4a40624 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 14 Jun 2023 20:13:52 +0000 Subject: bxjscls (14jun23) git-svn-id: svn://tug.org/texlive/trunk@67364 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls | 27 ++++++++++++++-------- 1 file changed, 17 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls') diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls index 4d50929b9dd..508b9732c5f 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} - [2022/04/10 v2.7a BXJS document classes] + [2023/06/14 v2.8 BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsreport} \newif\ifjsc@needsp@tch @@ -80,14 +80,6 @@ \else \def\bxjs@robust@def{\DeclareRobustCommand*} \fi -\newif\ifjsInPdfMode -\@nameuse{ImposeOldLuaTeXBehavior} -\let\bxjs@tmpa\PackageWarningNoLine -\let\PackageWarningNoLine\PackageInfo % suppress warning -\RequirePackage{ifpdf} -\let\PackageWarningNoLine\bxjs@tmpa -\@nameuse{RevokeOldLuaTeXBehavior} -\let\ifjsInPdfMode\ifpdf \newif\ifbxjs@explIII \@ifl@t@r\fmtversion{2020/02/02}{\bxjs@explIIItrue}{} \newif\ifbxjs@TUenc @@ -110,6 +102,13 @@ \expandafter\let\csname#1\endcsname} \def\bxjs@csletcs#1#2{% \expandafter\let\csname#1\expandafter\endcsname\csname#2\endcsname} +\RequirePackage{iftex} +\newif\ifjsInPdfMode +\@nameuse{jsInPdfMode\ifnum0% + \ifx\pdfoutput\@undefined\else\the\pdfoutput\fi + \ifx\outputmode\@undefined\else\the\outputmode\fi + >0 true\else false\fi} +\ifx\pdffalse\@undefined\else \bxjs@csletcs{ifjsInPdfMode}{ifpdf}\fi \def\bxjs@catopt#1#2{% #1\if\relax#1\relax\else\if\relax#2\relax\else,\fi\fi#2} \def\bxjs@ifplus#1{\@ifnextchar+{\@firstoftwo{#1}}} @@ -323,6 +322,7 @@ \def\eqnarray{% \stepcounter{equation}% \def\@currentlabel{\p@equation\theequation}% + \def\@currentcounter{equation}% \global\@eqnswtrue \m@th \global\@eqcnt\z@ @@ -340,6 +340,7 @@ \def\eqnarray{% \stepcounter{equation}% \def\@currentlabel{\p@equation\theequation}% + \def\@currentcounter{equation}% \global\@eqnswtrue\m@th \global\@eqcnt\z@ \tabskip\mathindent @@ -668,6 +669,7 @@ \DeclareOption{nosimplejasetup}{\bxjs@depre@opt@do{nosimplejasetup}{simple-ja-setup=false}} \DeclareOption{simplejasetup}{\bxjs@depre@opt@do{simplejasetup}{simple-ja-setup=true}} \bxjs@declare@bool@option{plautopatch}{plautopatch}{false} +\g@addto@macro\bxjs@plautopatchtrue{\let\bxjs@plautopatch@given\@undefined} \g@addto@macro\bxjs@plautopatchfalse{\def\bxjs@plautopatch@given{false}} \let\bxjs@org@removeelement\@removeelement \def\@removeelement#1#2#3{% @@ -797,6 +799,9 @@ \ifx\bxjs@driver@given\bxjs@driver@@none \bxjs@papersizefalse \fi +\@ifpackageloaded{plautopatch}{% + \bxjs@plautopatchtrue +}{} \def\bxjs@@minimal{minimal} \def\bxjs@@standard{standard} \def\bxjs@@pandoc{pandoc} @@ -869,7 +874,8 @@ \ifbxjs@oldfontcommands \AtEndOfClass{\allowoldfontcommands} \fi -\newdimen\stockwidth \newdimen\stockheight +\ifx\stockwidth\@undefined\newdimen\stockwidth\fi +\ifx\stockheight\@undefined\newdimen\stockheight\fi \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname iftombow\expandafter\endcsname\csname iftrue\endcsname \setlength{\stockwidth}{\paperwidth} @@ -2320,6 +2326,7 @@ \splittopskip\footnotesep \splitmaxdepth \dp\strutbox \floatingpenalty \@MM \hsize\columnwidth \@parboxrestore + \def\@currentcounter{footnote}% \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark }% -- cgit v1.2.3