summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-06-14 20:13:52 +0000
committerKarl Berry <karl@freefriends.org>2023-06-14 20:13:52 +0000
commit2ec558d7eabcf796669f115c3481cb80d4a40624 (patch)
treefd3ac77f56cb9ec8dc271b9ec56955ab5658713c /Master/texmf-dist/tex
parent1bc679a3072ee3db3e2c8e5bc7584d8514c01637 (diff)
bxjscls (14jun23)
git-svn-id: svn://tug.org/texlive/trunk@67364 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls27
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls27
-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.def73
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def30
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls27
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls27
11 files changed, 140 insertions, 81 deletions
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
index 4070718eb02..dc514c44d42 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}
- [2022/04/10 v2.7a BXJS document classes]
+ [2023/06/14 v2.8 BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsarticle}
\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}}}
@@ -317,6 +316,7 @@
\def\eqnarray{%
\stepcounter{equation}%
\def\@currentlabel{\p@equation\theequation}%
+ \def\@currentcounter{equation}%
\global\@eqnswtrue
\m@th
\global\@eqcnt\z@
@@ -334,6 +334,7 @@
\def\eqnarray{%
\stepcounter{equation}%
\def\@currentlabel{\p@equation\theequation}%
+ \def\@currentcounter{equation}%
\global\@eqnswtrue\m@th
\global\@eqcnt\z@
\tabskip\mathindent
@@ -660,6 +661,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{%
@@ -789,6 +791,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}
@@ -861,7 +866,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}
@@ -2193,6 +2199,7 @@
\splittopskip\footnotesep
\splitmaxdepth \dp\strutbox \floatingpenalty \@MM
\hsize\columnwidth \@parboxrestore
+ \def\@currentcounter{footnote}%
\protected@edef\@currentlabel{%
\csname p@footnote\endcsname\@thefnmark
}%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
index 1922c01fed6..3353d215cfd 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}
- [2022/04/10 v2.7a BXJS document classes]
+ [2023/06/14 v2.8 BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsbook}
\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
@@ -669,6 +670,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{%
@@ -798,6 +800,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}
@@ -870,7 +875,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}
@@ -2298,6 +2304,7 @@
\splittopskip\footnotesep
\splitmaxdepth \dp\strutbox \floatingpenalty \@MM
\hsize\columnwidth \@parboxrestore
+ \def\@currentcounter{footnote}%
\protected@edef\@currentlabel{%
\csname p@footnote\endcsname\@thefnmark
}%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
index c3f090276dc..a7db199620c 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{bxjscjkcat}
- [2022/04/10 v2.7a BXJS document classes]
+ [2023/06/14 v2.8 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 238c547eba9..49b757543eb 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{bxjscompat}
- [2022/04/10 v2.7a BXJS document classes]
+ [2023/06/14 v2.8 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 c390bd3c996..e0031f3ce26 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}
- [2022/04/10 v2.7a BXJS document classes]
+ [2023/06/14 v2.8 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 de56e9cba73..68160272632 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}
- [2022/04/10 v2.7a BXJS document classes]
+ [2023/06/14 v2.8 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 a51c0097880..a4b5bd23688 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}
- [2022/04/10 v2.7a BXJS document classes]
+ [2023/06/14 v2.8 BXJS document classes]
\input{bxjsja-standard.def}
\RequirePackage{bxjspandoc}
\ifjsWitheTeX\else
@@ -84,7 +84,7 @@
\let\bxjs@kv@orblockheading@true\bxjs@jp@or@block@headingtrue
\let\bxjs@kv@orblockheading@false\bxjs@jp@or@block@headingfalse
\define@key{bxjsPan}{or-block-heading}[true]{%
- \bxjs@set@keyval{blockheading}{#1}{}}
+ \bxjs@set@keyval{orblockheading}{#1}{}}
\def\bxjs@next#1{\bxjs@safe@setkeys{bxjsPan}{#1}}
\expandafter\bxjs@next\expandafter{\jsJaParam}
\@onlypreamble\bxjs@set@dupload@proc
@@ -121,7 +121,6 @@
\bxjs@next{#3}}%
\@firstoftwo}
\let\bxjs@polyglossia@options\relax
-\let\bxjs@babel@options\relax
\ifnum0\if x\jsEngine1\fi\if l\jsEngine1\fi>0
\pandocSkipLoadPackage{polyglossia}
\bxjs@set@dupload@proc{polyglossia.sty}{%
@@ -161,6 +160,7 @@
\setotherlangauge{\bxjs@tmpa}}}%
\let\bxjs@polyglossia@options\relax}%
\fi
+\let\bxjs@babel@options\relax
\pandocSkipLoadPackage{babel}
\bxjs@set@dupload@proc{babel.sty}{%
\bxjs@unset@dupload@proc{babel.sty}%
@@ -168,39 +168,52 @@
{Package babel is requested}%
\@tempswafalse \let\bxjs@babel@options\@empty
\def\bxjs@tmpb{main=}%
- \def\bxjs@next{main=japanese}%
\@for\bxjs@tmpa:=#1\do{%
- \ifx\bxjs@tmpa\bxjs@tmpb \@tempswatrue
- \else\ifx\bxjs@tmpa\bxjs@next \@tempswatrue
- \else \edef\bxjs@babel@options{\bxjs@babel@options,\bxjs@tmpa}%
- \fi\fi}%
- \if@tempswa
- \ClassWarning\bxjs@clsname
- {Main language is 'japanese', thus fallback\MessageBreak
- definitions will be employed}%
- \bxjs@pandoc@babel@ja
- \else
- \ClassWarning\bxjs@clsname
- {Main language is not 'japanese',\MessageBreak
- thus babel will be loaded}%
- \bxjs@cslet{ver@babel.sty}\@undefined
- \RequirePackage[#1]{babel}[]%
- \fi}
+ \ifx\bxjs@tmpa\bxjs@tmpb \def\bxjs@tmpa{main=japanese}\fi
+ \edef\bxjs@babel@options{\bxjs@babel@options,\bxjs@tmpa}}%
+ \bxjs@cslet{ver@babel.sty}\@undefined
+ \edef\bxjs@next{%
+ \noexpand\RequirePackage[\bxjs@babel@options]{babel}\relax
+ }\bxjs@next
+ \RequirePackage{bxorigcapt}\relax}
\g@addto@macro\bxjs@endpreamble@hook{%
\ifx\bxjs@babel@options\relax
\bxjs@cslet{ver@babel.sty}\@undefined
\fi}
-\@onlypreamble\bxjs@pandoc@babel@ja
-\def\bxjs@pandoc@babel@ja{%
- \bxjs@cslet{ver@babel.sty}\@undefined
- \edef\bxjs@next{%
- \noexpand\RequirePackage[\bxjs@babel@options,english]{babel}[]%
- }\bxjs@next
- \if j\jsEngine
- \RequirePackage[main=japanese]{pxbabel}[]%
- \else
- \RequirePackage{bxorigcapt}[]%
+\ifjsWitheTeX
+\AtBeginOfFile{japanese.ldf}{\bxjs@begin@japanese@ldf@hook}
+\def\bxjs@begin@japanese@ldf@hook{%
+ \let\bxjs@begin@japanese@ldf@hook\relax
+ \let\bxjs@save@ProvidesLanguage\ProvidesLanguage
+ \let\bxjs@save@LdfInit\LdfInit
+ \def\ProvidesLanguage##1[##2]{\bxjs@do@japanese@ldf{##2}}%
+ \def\LdfInit##1##2{\bxjs@do@japanese@ldf{0000/00/00}}}
+\def\bxjs@do@japanese@ldf#1{\bxjs@do@japanese@ldf@a#1\@nil}
+\def\bxjs@do@japanese@ldf@a#1/#2/#3#4#5\@nil{%
+ \let\LdfInit\bxjs@save@LdfInit
+ \ClassInfo\bxjs@clsname
+ {Release date of japanese.ldf is:\MessageBreak
+ \@spaces #1/#2/#3#4\@gobble}%
+ \ifnum#1#2#3#4<20201206 % v3.0
+ \let\bxjs@japanese@ldf@skipped=t\csuse{endinput}%
+ \fi}
+\AtEndOfFile{japanese.ldf}{\bxjs@end@japanese@ldf@hook}
+\def\bxjs@end@japanese@ldf@hook{%
+ \let\bxjs@end@japanese@ldf@hook\relax
+ \let\ProvidesLanguage\bxjs@save@ProvidesLanguage
+ \let\LdfInit\bxjs@save@LdfInit
+ \ifx t\bxjs@japanese@ldf@skipped
+ \ClassWarningNoLine\bxjs@clsname
+ {Loading japanese.ldf is skipped}%
+ \ifundef\l@japanese{\chardef\l@japanese\z@}{}%
+ \let\datejapanese\@empty\let\captionsjapanese\@empty
+ \let\extrasjapanese\@empty\let\noextrasjapanese\@empty
+ \main@language{japanese}%
\fi}
+\g@addto@macro\bxjs@begin@document@hook{%
+ \let\bxjs@begin@japanese@ldf@hook\relax
+ \let\bxjs@end@japanese@ldf@hook\relax}
+\fi
\bxjs@set@dupload@proc{geometry.sty}{%
\setpagelayout*{#1}}
\if l\jsEngine
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
index 9a60aa14fdc..69584b34e9b 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}
- [2022/04/10 v2.7a BXJS document classes]
+ [2023/06/14 v2.8 BXJS document classes]
%% このファイルは日本語文字を含みます
\input{bxjsja-minimal.def}
\bxjs@simplejasetupfalse
@@ -405,11 +405,29 @@
\bxjs@g@tmpa
\ifbxjs@hyperref@enc
\bxjs@check@hyperref@unicode{false}
- \ifjsWithupTeX\ifbxjs@old@hook@system\else
- \IfFileExists{pxjahyper-uni.def}{%
- \AddToHook{\bxjs@CGHN{package/hyperref/after}}{\input{pxjahyper-uni.def}}
- }{}
- \fi\fi
+ \@ifpackagelater{plautopatch}{2020/05/25}{% v0.9g
+ \let\bxjs@plautopatch@new=t}{}
+ \let\bxjs@avail@hy@unicode=f
+ \if \ifx t\bxjs@plautopatch@new T%
+ \else\ifbxjs@old@hook@system F\else T\fi\fi T%
+ \IfFileExists{pxjahyper-uni.def}{\let\bxjs@avail@hy@unicode=t}{}
+ \fi
+ \if t\bxjs@avail@hy@unicode
+ \ifjsWithupTeX
+ \ifbxjs@old@hook@system\else
+ \AddToHook{\bxjs@CGHN{package/hyperref/after}}{%
+ \input{pxjahyper-uni.def}}
+ \fi
+ \else
+ \let\bxjs@avail@hy@unicode=f
+ \ifx t\bxjs@plautopatch@new
+ \@ifl@t@r\fmtversion{2023/06/01}{\let\bxjs@avail@hy@unicode=t}{}
+ \fi
+ \fi
+ \fi
+ \if f\bxjs@avail@hy@unicode
+ \PassOptionsToPackage{unicode=false}{hyperref}
+ \fi
\fi
\if \ifx\bxjs@driver@given\bxjs@driver@@dvipdfmx T%
\else\ifjsWithpTeXng T\else F\fi\fi T%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
index 9f0a9a45836..a646ec8cef3 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{bxjspandoc}
- [2022/04/10 v2.7a BXJS document classes]
+ [2023/06/14 v2.8 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 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
}%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
index 2c680a25ff6..8edb9f4db73 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}
- [2022/04/10 v2.7a BXJS document classes]
+ [2023/06/14 v2.8 BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsslide}
\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}}}
@@ -317,6 +316,7 @@
\def\eqnarray{%
\stepcounter{equation}%
\def\@currentlabel{\p@equation\theequation}%
+ \def\@currentcounter{equation}%
\global\@eqnswtrue
\m@th
\global\@eqcnt\z@
@@ -334,6 +334,7 @@
\def\eqnarray{%
\stepcounter{equation}%
\def\@currentlabel{\p@equation\theequation}%
+ \def\@currentcounter{equation}%
\global\@eqnswtrue\m@th
\global\@eqcnt\z@
\tabskip\mathindent
@@ -660,6 +661,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{%
@@ -789,6 +791,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}
@@ -861,7 +866,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}
@@ -2191,6 +2197,7 @@
\splittopskip\footnotesep
\splitmaxdepth \dp\strutbox \floatingpenalty \@MM
\hsize\columnwidth \@parboxrestore
+ \def\@currentcounter{footnote}%
\protected@edef\@currentlabel{%
\csname p@footnote\endcsname\@thefnmark
}%